Merge pull request #1 from liuganggang/master

取消跟coupon,promocard,gift_card,gift_card_types等有关优惠券的代码
升级rails 3.2.13
fix
fix
fix bug
fix
fix
rework
cp
购物车UI
fix
Merge branch 'master' of github.com:yggc/sc
order new
order success
搜索产品
Merge branch 'master' of github.com:yggc/sc
订单倒计时
pm to sc
Merge branch 'master' of github.com:yggc/sc
修改代理商列表