Merge branch 'master' of https://github.com/openconf/jschat
Merge branch 'master' of https://github.com/openconf/jschat