Testst
Merge branch 'transfer' of github.com:genomizer/genomizer-server into transfer

Conflicts:
	.classpath