Merge branch 'chats'
instructor feeds page
Merge branch 'master' into chats