fix merchant edit page bug
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131207-cpucard
fix cpucard bug