Merge branch 'master' into alan_attack_tree_gen

Makefile

build.txt

modeling/DIPLODOCUS/SmartCardProtocol.xml

modeling/test/testTag.xml

scripts/cidoc.md

src/main/java/ai/AIUseCaseDiagram.java

src/main/java/avatartranslator/AvatarBlock.java

...n/java/avatartranslator/AvatarCompactDependencyGraph.java

src/main/java/avatartranslator/AvatarDependencyGraph.java

src/main/java/avatartranslator/AvatarElement.java

src/main/java/avatartranslator/AvatarSpecification.java

src/main/java/avatartranslator/AvatarStateMachine.java

...main/java/avatartranslator/AvatarStateMachineElement.java

src/main/java/cli/Action.java

src/main/java/cli/DiplodocusPatternHandling.java

src/main/java/cli/Interpreter.java

src/main/java/common/CanBeTagged.java

src/main/java/common/Tag.java

src/main/java/common/Tags.java

src/main/java/graph/AUTGraph.java