merge...

build.txt

modeling/AVATAR/CoffeeMachine_Avatar.xml

src/main/java/attacktrees/Attack.java

src/main/java/attacktrees/AttackNode.java

src/main/java/avatartranslator/AvatarAttribute.java

src/main/java/avatartranslator/AvatarLibraryFunction.java

src/main/java/proverifspec/ProVerifOutputAnalyzer.java

src/main/java/tmltranslator/TMLModeling.java

src/main/java/tmltranslator/TMLTextSpecification.java

src/main/java/tmltranslator/toavatarsec/TML2Avatar.java

src/main/java/ui/AttackTreePanel.java

src/main/java/ui/MainGUI.java

src/main/java/ui/atd/ATDAttack.java

src/main/java/ui/atd/ATDConstraint.java

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

src/main/java/ui/tmlad/TMLADEncrypt.java

src/main/java/ui/tmlad/TMLADWriteChannel.java

src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java

src/main/java/ui/tmlcompd/TMLCPrimitivePort.java

src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java