Conflict in user-room saving bug.
Merge pull request #152 from scrollback/userbug

Conflict in user-room saving bug.