lots of changes
Merge branch 'master' of https://github.com/NilsEdison/SBB-Ticketautomat

Conflicts:
	ZVV_Verbindung_1.html