Merge branch 'master' into 'minh-issue_183'

Makefile

build.txt

modeling/DIPLODOCUS/ModelsForZ3Tests/RX5Gphy.xml

modeling/DIPLODOCUS/ModelsForZ3Tests/Z3SimpleTestCase.xml

modeling/DIPLODOCUS/SmartCardProtocol.xml

modeling/DIPLODOCUS/ZigBeeTutorial.xml

modeling/SysMLSec/SysMLSecTutorial.xml

simulators/c++2/src_simulator/app/TMLExeciCommand.cpp

src/main/java/common/ConfigurationTTool.java

src/main/java/help/HelpEntry.java

src/main/java/help/HelpManager.java

src/main/java/myutil/Conversion.java

src/main/java/tmltranslator/HwExecutionNode.java

src/main/java/tmltranslator/TMLArchiTextSpecification.java

src/main/java/tmltranslator/TMLMapping.java

src/main/java/tmltranslator/TMLTask.java

src/main/java/tmltranslator/TMLTextSpecification.java

src/main/java/tmltranslator/dsez3engine/InputInstance.java

...ain/java/tmltranslator/dsez3engine/OptimizationModel.java

...in/java/tmltranslator/modelcompiler/TMLModelCompiler.java