hibernate mapping
Merge Hibernate/DAO Tests with master