variables and touches
Merge branch 'master' of https://github.com/MarcoLuthi/SBB-MO-GUI

Conflicts:
	SBB-MO/css/app.css
Merge branch 'master' of https://github.com/MarcoLuthi/SBB-MO-GUI