Jetzt aber
Jetzt
Merge branch 'dev' of https://github.com/redliontom/SKS-Website into dev

Conflicts:
	routing.js