hibernate session factory replaced by jpa entitymanager factory
updated
Merge branch 'master' of https://github.com/deadlydirk/simple-web-app

Conflicts:
	pom.xml