update classes
Merge branch 'master' of https://github.com/unewochialat/umleditor

Conflicts:
	P2/Code/DiagrammManager.java
merge DiagrammManager