fixed chat messaging
Code clean up
Merge branch 'master' of https://github.com/admix/multi-chat
Merge branch 'dev'