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

6cc6f7ad81381fce28063f.