merge
MAJ Client, ClientDAOImplJPATest