Fixed compilation errors in test project.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel into dev
Merge