Displaying markers
Merge branch 'markers'

Conflicts:
	app/partials/map.html