ffds
Merge branch 'master' of
https://github.com/genomizer/genomizer-desktop.git

Conflicts:
	src/controller/Controller.java
	src/model/GenomizerModel.java
	src/model/Model.java