Updated with a delete and with "comment" boxes...
Merge remote-tracking branch 'origin/master'

Conflicts:
	UMLCanvas.java
	UMLSave.java