Merge branch 'master' into chats
some fixes to CSS
Merge branch 'chats'