NEW_RELICFILE
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into aliyun

Conflicts:
	config.py
	startApp.sh
Merge branch 'aliyun' of file:////data/nozomi-9-24 into aliyun

Conflicts:
	app.py
	config.py
	startApp.sh
Aliyun
old tes
Merge branch 'aliyun' of http://github.com/lhr530124/nozomiServer into aliyun

Conflicts:
	startApp.sh