Merge branch 'master' into alan_attack_tree_gen

build.txt

src/main/java/attacktrees/Defense.java

src/main/java/ui/AvatarPanelDrawer.java

src/main/java/ui/MainGUI.java

src/main/java/ui/atd/AttackTreeDiagramPanel.java

src/main/java/ui/avatarsmd/AvatarSMDConnector.java

src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java

src/main/java/ui/util/DefaultText.java