Can now remove annotations with buttonclick!
Merge branch 'sysadmin'

Conflicts:
	src/controller/Controller.java
	src/gui/GUI.java