More groupchat implementation
Merge remote-tracking branch 'origin/master'
More group chat implementation