web使用PUSH方式同步卡和手机
Merge remote-tracking branch 'origin/master'

* origin/master:
  ignore shared
  add merchant detail
Merge remote-tracking branch 'origin/master'

* origin/master:
  add will_paginate config