More implementing to cancelBooking test
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Added returntype to getcost in receipt. Added new method to
getBookableObject in the adminInterface