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

build.txt

libs/commons-io-1.3.1.jar

libs/commons-io-2.4.jar

libs/commons-io-2.5-javadoc.jar

modeling/AVATAR/CoffeeMachine_Avatar.xml

modeling/DIPLODOCUS/testBusSlice.xml

src/main/java/ui/TDiagramPanel.java

src/main/java/ui/avatarbd/AvatarBDBlock.java

src/main/java/ui/avatarbd/AvatarBDPanel.java

src/main/java/ui/avatarbd/AvatarBDPortConnector.java

src/main/java/ui/avatarbd/AvatarBDToolBar.java

...ava/ui/networkmodelloader/JDialogLoadingNetworkModel.java

src/main/java/ui/util/DefaultText.java

src/main/resources/help/addRule.html

src/main/resources/help/considerRule.html

src/main/resources/help/considerRule.md

src/main/resources/help/help.css

src/main/resources/help/helpTable.txt

src/main/resources/help/requirements.html

src/main/resources/help/requirements.md