短信通道修改，增加channel配置，=1时为天利配置，=2时为宏讯配置
修正 修改完成后不能再次修改的问题
修改权限，增加后台登录，修改上传IE不显示进度条问题
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-api/src/main/webapp/.#webclasspath
Merge branch 'master' of https://github.com/source3g/hermes.git
Merge branch 'master' of https://github.com/source3g/hermes.git
增加日志类，修改导入，增加开关保存状态，修改来电状态
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-dictionary/src/main/java/com/source3g/hermes/dictionary/service/BranchAndSalersService.java
	hermes/hermes-web/src/main/java/com/source3g/hermes/admin/controller/BranchAndSalersController.java