Merge branch 'master' of https://github.com/quyidong/ices_alarm
Merge branch 'master' of https://github.com/quyidong/ices_alarm
Merge remote-tracking branch 'origin/develop'

Conflicts:
	src/main/java/com/nsn/netty/cfg/NettyConfig.java
	src/main/resources/database-server.properties
Test
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/nsn/netty/cfg/NettyConfig.java
	src/main/resources/database-server.properties