1.添加标签测试
2.修复删除标签后不能删除商户标签的BUG
添加标签测试
commit test
Merge branch 'master' of https://github.com/sufish/wheat-web

Conflicts:
	system/db/schema.rb