Fix merge issue
Merge branch 'master' of github.com:JarvusInnovations/SeptaMobi

Conflicts:
	app/view/stops/NavView.js