Added map for locations.
Merge branch 'master' of github.com:Lochbridge/t1-dpl-hackathon

Conflicts:
	app/css/app.css