usual merge

build.txt

capectracer/capec_dict.py

capectracer/capec_tracer.py

src/main/java/ai/AIAPTMitigations.java

src/main/java/ai/AIAttackPatternTree.java

src/main/java/ai/AIAttackPatternTree1.java

src/main/java/ai/AIAttackPatternTree2.java

src/main/java/ai/APTAuditor.java

src/main/java/ai/CAPECTracer.java

src/main/java/attacktrees/Attack.java

src/main/java/attacktrees/AttackNode.java

src/main/java/cli/Action.java

src/main/java/cli/Interpreter.java

...va/tmltranslator/tomappingsystemc2/MappedSystemCTask.java

src/main/java/ui/ActivityDiagram2TMLTranslator.java

src/main/java/ui/AttackTreePanelTranslator.java

src/main/java/ui/MainGUI.java

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

src/main/java/ui/atd/ATDCountermeasure.java

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