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

Conflicts:
	SBB-MO/index.html