商户增加界面 增加标签分类
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-api/src/main/webapp/.#webclasspath
	hermes/hermes-web/src/main/webapp/.#webclasspath
	hermes/hermes-web/src/main/webapp/jsp/merchant/accountCenter/resourceSetting.jsp