android paypal google checkout
Merge branch 'english' of github.com:lhr530124/nozomiServer into english
before merge english
Merge branch 'english' of http://github.com/lhr530124/nozomiServer into english
fix remove all localhost just use inner ip
onlien User code
Merge branch 'english' of github.com:lhr530124/nozomiServer into english

Conflicts:
	startApp.sh
fix getBattleHistoryError
Merge branch 'english' into mainServer

Conflicts:
	config.py
	startApp.sh