chat layout 1
Merge origin/master