商户资源删除
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-api/src/main/webapp/.#webclasspath