Major update with a ton of changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/controllers/MapCtrl.js
	www/partials/home/map.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/controllers/MapCtrl.js
	www/partials/home/map.html