去掉logback,修改小bug,修改日志保存的文件
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-message/src/main/java/com/source3g/hermes/message/api/MessageApi.java
	hermes/hermes-web/src/main/webapp/jsp/admin/login.jsp
	hermes/hermes-web/src/main/webapp/jsp/merchant/customer/callInList.jsp
电子菜单
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-web/src/main/java/com/source3g/hermes/admin/controller/VersionController.java
f