android paypal google checkout
Merge branch 'english' of github.com:lhr530124/nozomiServer into english
聊天服务器 支持数据库持久化

Conflicts:

	test.js
聊天数据库 和 脚本
clearBattleState
new sql data
chat english
english chat
Merge branch 'english' into mainServer

Conflicts:
	startApp.sh
add donates-cache to fix donate bug
add test log
aliyun

Conflicts:

	app.py
fix login reward bug
test getData
9700
reward
rank server
Merge branch 'english' into mainServer
update score no more than 200 in one war
nozomi_rank check oldScore newScore