Added hid:String to RoomReservation & Room Invoice constructors to match
database tables
Merge remote-tracking branch 'origin/Iteration1' into Iteration1_M