Merge branch 'master' into chats
fixing styles all over the app
Merge branch 'master' into chats
Merge branch 'master' into chats
fixing course constructor
Merge branch 'chats'