Fixed some merge issues
Merge branch 'communication' of https://github.com/genomizer/genomizer-server.git into communication