load actual object instead of string for room from cookie
Merge branch 'master' into gh-pages