Merge branch 'chats'
remove class form container if need
Merge branch 'master' into chats