Fixed editing rooms
Merge branch 'master' into kingman