Merging newest updates to master branch

Alan Birchler De Allenderequested to merge
alan_attack_tree_gen into master

Small code changes were added to fix some bugs with the att-defense tree generator.

Merge request reports