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

Conflicts:
	server/src/java/storage/entities/Klasse.java