GenericDAOImplHibernate
User
Merge origin/master