Fixing map
Add-location and about map dialogs
Merge branch 'master' into origin-deployment

Conflicts:
	app/assets/javascripts/backbone/models/location.js.coffee
	app/assets/javascripts/backbone/templates/map.jst.ejs