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

Conflicts:
	src/controller/Controller.java