Started working on a new modify popup to solve some problems
merging
merging
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git into dev

Conflicts:
	src/util/IconFactory.java