Merge branch 'master' of https://github.com/cqan/cbms.git
Merge branch 'master' of https://github.com/cqan/cbms.git

Conflicts:
	cbms-web/src/main/java/com/cqan/service/NetConfigService.java
	cbms-web/src/main/java/com/cqan/service/impl/AccountAuthServiceImpl.java
	cbms-web/src/main/java/com/cqan/service/impl/AccountTaskServiceImpl.java