Nothing of interest to report.
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/guestclient/TestGuestScenario.java
Updated model and implemented the operation to set the cost for a type.