fixed some mergers with all other shit hehe
Fixed all mergeporblems, the new tabledata model have not been merge yet, John do not fix thistonight we have a plan! :). We will fix it tomorrow
mjo
Merge branch 'master' of
https://github.com/genomizer/genomizer-desktop.git

Conflicts:
	.classpath
Fixed Query Builder Rows. Now they look legit on windows as well.
QueryBuilderRow class needs some clean up....
Small aesthetic changes.
Unused tabs commented out
Fixed AddAnnotationRequest
Merge remote-tracking branch 'origin/master' into sysadmin

Conflicts:
	src/controller/Controller.java
	src/gui/sysadmin/SysadminController.java