hello sysadmin!
removed testoutput
fix remove annotation question?
added missing libraries....
Fix for presentation
Merge remote-tracking branch 'origin/master' into sysadmin

Conflicts:
	.classpath
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
merged sysadming with master
I think I finally fixed addAnnotation... lets see if it works on monday
Merge remote-tracking branch 'origin/master' into sysadmin

Conflicts:
	src/controller/Controller.java
	src/gui/sysadmin/SysadminController.java
master commit hihi
Merge branch 'master' of github.com:genomizer/genomizer-desktop
Merge branch 'master' into dev

Conflicts:
	.classpath
	src/controller/Controller.java
	src/gui/GUI.java
	src/gui/GenomizerView.java
	src/gui/QueryBuilderRow.java