Hibernate.cfg
Merge origin/master