Merge branch 'master' into chats
added class
Merge branch 'chats' into chats-angular