enhanced map

Conflicts:
	application/views/front/map.html
enhanced map