setting position properly on room change
Merge branch 'gh-pages'