add map
shop detail info include map etc.
add link to layout and fix some bugs
Merge branch 'merchant_map'

Conflicts:
	app/views/layouts/merchant.html.erb