积分换礼
Merge branch 'zhuanglong_dev'
Merge branch 'master' of https://github.com/StephenZhuang/UDAC