merchant search pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	portal/app/controllers/merchant_controller.rb
	portal/app/views/merchant/index.html.erb
merchant search pages