Rooms now default to demo.
File API
Merge branch 'glavin' into dawson
Updating for demo.