asd
Merge branch 'communication' of
https://github.com/genomizer/genomizer-server.git into communication

Conflicts:
	src/server/test/dummies/serverTests.java