changed to scracthy again
Started changes to edit.
Merge branch 'Sysadmin' of
https://github.com/genomizer/genomizer-desktop.git into Sysadmin

Conflicts:
	src/gui/LoginWindow.java
	src/gui/sysadmin/annotationview/EditAnnotationPopup.java
	src/gui/sysadmin/annotationview/SysadminAnnotationPopup.java