Rollback of hibernate3-maven-plugin 2.2-to-3.0 upgrade since major
difference in configuration
Merge remote-tracking branch
'origin/hibernate3-maven-plugin-version-issue'

Conflicts:
	pom.xml