Merge branch 'master' into syscams

build.txt

modeling/AVATAR/testReq.xml

modeling/DIPLODOCUS/SmartCardProtocol_sec.xml

src/.classpath

src/main/java/avatartranslator/AvatarAction.java

src/main/java/avatartranslator/AvatarActionAssignment.java

src/main/java/avatartranslator/AvatarActionOnSignal.java

src/main/java/avatartranslator/AvatarArithmeticOp.java

src/main/java/avatartranslator/AvatarAttribute.java

src/main/java/avatartranslator/AvatarAttributeState.java

src/main/java/avatartranslator/AvatarBinaryGuard.java

src/main/java/avatartranslator/AvatarBlock.java

src/main/java/avatartranslator/AvatarComposedGuard.java

src/main/java/avatartranslator/AvatarConstant.java

src/main/java/avatartranslator/AvatarConstantGuard.java

src/main/java/avatartranslator/AvatarDummyState.java

src/main/java/avatartranslator/AvatarElement.java

src/main/java/avatartranslator/AvatarGuard.java

src/main/java/avatartranslator/AvatarGuardElse.java

src/main/java/avatartranslator/AvatarGuardEmpty.java