Fixed merge issues
Merge branch 'dev' of https://github.com/ModelDrivenMiddleEarth/ModelDrivenHotel into dev