App not FOund???
Merge branch 'master' of https://github.com/exophunk/MTR_SBB_Redesign

Conflicts:
	js/app/templates/components/comp_footer.html