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

Conflicts:
	.classpath
	src/util/TreeTable.java