Merge branch 'master' into chats
added block to materials
Merge branch 'chats'