refactoring
Merge branch 'asd' into unstable
activemq removed, chat ported to eventbus