Merge
Merge branch 'staging' of github.com:fluxusfrequency/milehigh into staging

Conflicts:
	app/controllers/dashboard_controller.rb
adds store slug to url for store show page.