new user no login reward  old usr has login reward
old User new User login
Merge branch 'mainServer' of github.com:lhr530124/nozomiServer into mainServer
now time
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into slave

Conflicts:
	startApp.sh