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