删除配置文件
端口改回为初始值
请看app.js
客户定制版本：端口号改为900
Merge branch 'forCustom' into develop

Conflicts:
	app.js
custom.js added by lupeipei
Merge branch 'forCustom' into develop