map.js again
Merge branch 'master' of https://github.com/irony/Narmaste

Conflicts:
	public/javascripts/map.js