segmented buttons & dashboard changes
Merge branch 'master' of https://github.com/JarvusInnovations/SeptaMobi

Conflicts:
	resources/sass/app.scss