Merge remote-tracking branch 'origin/master' into alessandro_branch

build.txt

graphminimize/build.gradle

graphminimize/manifest.txt

graphshow/build.gradle

graphshow/manifest.txt

launcher/build.gradle

launcher/manifest.txt

modeling/AVATAR/AirbusDoor_V2.xml

modeling/AVATAR/CoffeeMachine_Avatar.xml

modeling/AVATAR/FutureAirNavigationSystem.xml

modeling/DIPLODOCUS/SmartCardProtocol.xml

simulators/c++2/src_simulator/sim/Server.cpp

src/main/java/avatartranslator/AvatarRandom.java

src/main/java/avatartranslator/AvatarTransition.java

...tartranslator/directsimulation/AvatarSimulationBlock.java

.../directsimulation/AvatarSimulationPendingTransaction.java

src/main/java/cli/Action.java

src/main/java/cli/Interpreter.java

src/main/java/cli/Print.java

src/main/java/cli/SimulatorScript.java