Changed some minor things for tests
Merge branch 'master' of https://github.com/CitySim/NSA-Stundenplan.git

Conflicts:
	server/src/test/server/suite/AllTests.java