Merge branch 'master' into chats
added modal
Merge branch 'chats'