refactor ReservationDAO interface
Merge origin/master