Merge branch 'master' into develop
fix JSON response for groupchat methods
Merge branch 'develop' into gh-pages