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

Conflicts:
	server/src/test/server/persistance/HibernateTest.java