edit chat feature
QMW-158 & QMW-124 fixes
QMW-157 fix
Merge branch 'feature.groupchat' into gh-pages