Merge branch 'master' into chats
added toggling chat windows
Merge branch 'chats'