chat page upgrades
Merge branch 'master' into front_end