Expedia-fy number of rooms and number of floors
Merge branch 'dev' of https://github.com/roomblocker/roomblocker-mean into dev