merge ck
Merge remote-tracking branch 'origin/master'
Logik
l
Merge remote-tracking branch 'origin/ck_test'

Conflicts:
	UML/src/application/Package.java
	UML/src/application/Typ.java
	UML/src/application/UMLEditor.java
	UML/src/application/UMLEditorController.java

Merged this conflicts, please check UMLEditorController TODO's... Not
sure if I merged correctly