before merge newbie reward
aliyun

Conflicts:

	app.py

Conflicts:

	app.py
checkUserReward
after merge newbie