name to item in add marker, map.js
item to title in map.js add marker
Merge branch 'master' into develop

Conflicts:
	app/assets/javascripts/map.js