Merge branch 'master' into alan_attack_tree_gen

build.txt

modeling/AVATAR/AirbusDoor.xml

modeling/DIPLODOCUS/SmartCardProtocol_sec.xml

src/main/java/attacktrees/AttackTree.java

src/main/java/attacktrees/Defense.java

src/main/java/avatartranslator/AvatarAMSInterface.java

src/main/java/avatartranslator/AvatarAction.java

src/main/java/avatartranslator/AvatarActionAssignment.java

src/main/java/avatartranslator/AvatarActionOnSignal.java

src/main/java/avatartranslator/AvatarAttribute.java

src/main/java/avatartranslator/AvatarBlock.java

src/main/java/avatartranslator/AvatarDataType.java

src/main/java/avatartranslator/AvatarElement.java

src/main/java/avatartranslator/AvatarLibraryFunction.java

src/main/java/avatartranslator/AvatarMethod.java

src/main/java/avatartranslator/AvatarRandom.java

src/main/java/avatartranslator/AvatarSetTimer.java

src/main/java/avatartranslator/AvatarSpecification.java

src/main/java/avatartranslator/AvatarStateMachine.java

src/main/java/avatartranslator/AvatarStateMachineOwner.java