SearchAvailableTypes test now covers more. When making a booking
prefered type is now always added
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev