show merchant info and edit it
add error messages
add map
Merge branch 'merchant_info'

Conflicts:
	app/views/merchant/portal_styles/index.html.erb
	config/routes.rb