Merge branch 'DataManagement' into 'master'
fix import change from Hibernate 4.3 to 4.2