Started implementation of Assignextrakey test case
Fixed faults in model
Revert "Fixed faults in model"

This reverts commit 0712ae3a7c3e25bb33f73e5999aa98b4bcd6a9e6.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Fixes to the model and regenerated code
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev