deliverable commit
Merge branch 'master' of https://github.com/eltsdev/hotelmania.git