pre-conflict
Merge branch 'master' of https://github.com/kalifousHome/plugins.git

Conflicts:
	UML Diagramm.ucls
	src/plugins/ToolsMenu.java
	
	+ TESTS