Dev->Master merge 9/8

Dave's sweet Hotel detail changes