Merge remote-tracking branch 'origin/master' into revert-883077ef

Makefile

build.txt

modeling/AVATAR/AirbusDoor_V2.xml

src/main/java/avatartranslator/AvatarBlock.java

src/main/java/avatartranslator/AvatarExpressionSolver.java

src/main/java/avatartranslator/AvatarSyntaxChecker.java

...tartranslator/directsimulation/AvatarSimulationBlock.java

...nslator/directsimulation/AvatarSimulationTransaction.java

...in/java/avatartranslator/modelchecker/SafetyProperty.java

src/main/java/myutil/CSVObject.java

src/main/java/myutil/FileUtils.java

src/main/java/tmltranslator/touppaal/TML2UPPAAL.java

src/main/java/ui/AvatarDesignPanelTranslator.java

src/main/java/ui/MainGUI.java

src/main/java/ui/SimulationTrace.java

...ractivesimulation/AvatarInteractiveSimulationActions.java

...vatarinteractivesimulation/AvatarMainCommandsToolBar.java

...eractivesimulation/JFrameAvatarInteractiveSimulation.java

src/main/java/ui/file/CSVFileFilter.java

src/main/java/ui/tree/JDiagramTree.java