Merge branch 'chats'
adding data attributes for chat to work
Merge branch 'master' into chats