working on MEN-33
Merge branch 'master' of github.com:AstralDynamics/PyChat.js