Every room now has it's own RoomModel
Added comments
Merge branch 'roomModels' into dev