Merge branch 'chats'
layout for materials
Merge branch 'master' into chats