refactor reservationDAOImpl
Merge origin/master