Hibernate
Merge branch 'master' of https://github.com/CitySim/NSA-Stundenplan.git

Conflicts:
	server/.classpath