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

Conflicts:
	.DS_Store
	Bastel/.DS_Store
	Icons/.DS_Store
	javascripts/.DS_Store