添加商铺标签管理
Merge remote-tracking branch 'origin/master'

* origin/master:
  add merchant operation

Conflicts:
	system/config/routes.rb