Create a new room if there is none
Merge branch 'master' into gh-pages