Trying to get table to work...
Merge branch 'master' of
https://github.com/genomizer/genomizer-desktop.git

Conflicts:
	src/controller/Controller.java
	src/genomizerdesktop/Genomizer.java
	src/gui/GenomizerView.java
	src/gui/sysadmin/AnnotationTableModel.java
	src/gui/sysadmin/SysadminTab.java
	src/model/GenomizerModel.java
Merge branch 'master' of https://github.com/genomizer/genomizer-desktop.git
Can now delete!
merged
Merge branch 'master' of
https://github.com/genomizer/genomizer-desktop.git

Conflicts:
	src/util/AnnotationDataTypes.java