Merge branch 'master' into alan_attack_tree_gen

build.txt

src/main/java/avatartranslator/AvatarError.java

src/main/java/avatartranslator/AvatarSyntaxChecker.java

src/main/java/avatartranslator/AvatarTransition.java

src/main/java/avatartranslator/AvatarTuple.java

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

src/main/java/ui/window/JDialogAttack.java

src/main/java/ui/window/JFrameAI.java

...rc/test/java/avatartranslator/AvatarIBSStdParserTest.java

...ranslator/AvatarIntegerExprParsingAndEvaluationTests.java