dsa
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop into dev

Conflicts:
	src/gui/UploadTab.java
safd
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop into dev
added listeners to the comboboxes in upload etc.
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop into dev