rm log
Merge branch 'mainServer' of github.com:lhr530124/nozomiServer into mainServer
rm mysql log
changed purchase process and add kaixin diff
Merge branch 'mainServer' of github.com:lhr530124/nozomiServer into mainServer
change force update to ios
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into slave

Conflicts:
	module/UserRankModule.py