修改设置现金券接口
修改获取有效券包
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改现金券获取时间段
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
在券包管理中增加富文本编辑
merge code
修改活动规则、券、券包，增加富文本编辑
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改文本框长度
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改图片显示
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改现金券绑卡
修正商户下发bug
修改现金券绑卡赠送
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改集团商户选择
merge code