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

Conflicts:
	src/controller/Controller.java