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

Conflicts:
	src/controller/Controller.java
	src/gui/GUI.java
	src/gui/GenomizerView.java
	src/gui/ProcessTab.java
	src/gui/WorkspaceTab.java
	src/model/GenomizerModel.java
	src/model/Model.java
Merge branch 'master' of
https://github.com/genomizer/genomizer-desktop.git

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