hibernate setup
Merge branch 'hibernate'

Conflicts:
	src/main/resources/META-INF/app-context.xml