Going public
Merge branch 'master' into leaflet

Conflicts:
	views/location.ejs