formatted
merged
gergfdhgfd
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git
into dev

Conflicts:
	src/util/TreeTable.java
fixade saker i treetable