Update to RoomBuilder it is now more efficient and object ids are now
required to be < 9
Merge remote-tracking branch 'origin/master'