Merge branch 'master' into alan_attack_tree_gen

build.txt

modeling/AVATAR/CoffeeMachine_Avatar.xml

modeling/SysMLSec/AliceAndBob.xml

src/main/java/avatartranslator/AvatarAttribute.java

src/main/java/avatartranslator/AvatarBlock.java

src/main/java/avatartranslator/AvatarError.java

src/main/java/avatartranslator/AvatarSignal.java

src/main/java/avatartranslator/AvatarSpecification.java

src/main/java/avatartranslator/AvatarStateMachine.java

src/main/java/avatartranslator/AvatarSyntaxChecker.java

...ain/java/avatartranslator/toproverif/AVATAR2ProVerif.java

src/main/java/ui/TAttribute.java

src/main/java/ui/TDiagramPanel.java

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