增加连接池连接支持
Merge remote-tracking branch 'origin/master'

Conflicts:
	settings.js