updated JPAReservationDAOTest
Merge origin/master