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

Conflicts:
	server/src/java/server/entities/ReplacementDeserializer.java
Merge branch 'master' of https://github.com/CitySim/NSA-Stundenplan.git