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

modeling/AVATAR/CoffeeMachine_Avatar.xml

modeling/AVATAR/testQuery.xml

modeling/DIPLODOCUS/SmartCardProtocol.xml

src/main/java/avatartranslator/AvatarBlockTemplate.java

src/main/java/ui/ActionPerformer.java

src/main/java/ui/AvatarDesignPanel.java

src/main/java/ui/MainGUI.java

src/main/java/ui/TGComponentManager.java

src/main/java/ui/TGUIAction.java

src/main/java/ui/avatarad/AvatarADToolBar.java

src/main/java/ui/avatarsmd/AvatarSMDQueryReceiveSignal.java

src/main/java/ui/avatarsmd/AvatarSMDToolBar.java

src/main/java/ui/window/JDialogAvatarQuerySignal.java

...test/resources/ui/diagram2tml/input/SmartCardProtocol.xml