Created branch for hibernate 4.2
Merge branch 'hibernate4.2'

Conflicts:
	pom.xml