merchant search function
map
Merge branch 'master' of github.com:sufish/wheat-web

Conflicts:
	portal/app/controllers/map_controller.rb