Added Mapbox to /map page and added markers functionality to map
Merge https://github.com/PoetsRock/MappingSLC

Conflicts:
	.gitignore
	README.md
	app/views/layout.server.view.html
	bower.json
	config/env/all.js
	config/env/development.js
	config/env/production.js
	config/env/test.js
	package.json
	public/config.js
	public/modules/core/views/header.client.view.html