Tarifwahl Screen gemacht
Merge branch 'master' of https://github.com/exophunk/MTR_SBB_Redesign

Conflicts:
	js/app/templates/screens/screen_start.html
	sass/_components.scss
Tarifwahl
Merge branch 'master' of https://github.com/exophunk/MTR_SBB_Redesign