Hibernate reverted
Merge branch 'master' of https://github.com/enwida/idpRepo

Conflicts:
	workspace/enwida/pom.xml
	workspace/enwida/src/main/java/de/enwida/web/model/User.java