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

Conflicts:
	src/controller/Controller.java
Merge remote-tracking branch 'origin/dev' into dev