first e2e-test, sbb-js-formatter-settings
Merge branch 'develop' into e2e-tests

Conflicts:
	app/scripts/controllers/TrackController.js
	app/views/tracks.html
	test/unit/TrackControllerTest.js
Merge pull request #32 from SchweizerischeBundesbahnen/e2e-tests-and-sbb-conventions

approved by myself. very good.