Conflicts:
library/Action/HuodongAction.php
library/LibModels/Wap/Cuxiao/ActivityData.php
library/LibModels/Wap/Home/UserData.php
template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser3-test.phtml
template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser3.phtml
template/huodong.m.yohobuy.com/partials/cuxiao/yuanxiao/footer.phtml
yohobuy/huodong.m.yohobuy.com/application/models/Cuxiao/Yuanxiao.php
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php
