Room templates
Merge branch 'master' of https://github.com/pboechat/MexicanStandOff
merge