fixed chat bar
Merge branch 'master' into chats