修改日志
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131229-card