5555555
Merge branch 'master' of https://github.com/source3g/hermes.git
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
Merge branch 'master' of https://github.com/source3g/hermes.git
增加一个短信通道
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-web/src/main/webapp/jsp/admin/system/failedJmsList.jsp