现金券增加退货功能
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改pos前置打印小票日期24小时制，以及现金券购买
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
解决pos撤销金额无效问题
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
增加现金券解绑客户券方法
修改现金券webservice接口
修改现金券接口，增加领用接口
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改接口测试用例
merge code