resolve inspection warnings
Merge pull request #159 from SchweizerischeBundesbahnen/feature/STZE/clean_up

resolve inspection warnings
Merge branch 'develop' into feature/STZE/update_angular

Conflicts:
	app/scripts/app.js