修改配置文件格式
Merge remote-tracking branch 'origin/master'

Conflicts:
	Config/dbconfig.js