Merge remote-tracking branch 'siked/2.0' into 2.0

# Conflicts:
#	Cold_Api6200
#	Cold_Api6201
#	lastupdate.tmp
#	logs/logx/logx.log
#	server.pid
#	tests/default_test.go