before merge mainServer Code
Merge branch 'aliyun' of http://github.com/lhr530124/nozomiServer into aliyun
update score no more than 200 in one war

Conflicts:

	config.py
	module/UserRankModule.py
	script/synUserRankToRedis.py
	startSort.sh
nozomi_rank check oldScore newScore
updateScore syn app2 score

Conflicts:

	app.py
	startApp.sh