Add Room model
Merge with master and fix conflicts