markup for chat window
Merge branch 'master' into chats