Added a hotels app.
Fixed merge
Merge branch 'matason-master'