Some billing changes
RoomReservationServiceImpl merge conflict fix