Fixed the view room template
Merge branch 'master' into kingman