changed Reservation to allow for a base rate and a stored calcuated rate. Also added support for isHoliday for Reservation and Hotel
fixed merged conflicts