Merge branch 'chats'
some changes to materials page
Merge branch 'master' into chats