Fix commit
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev