update gem lock
Merge remote-tracking branch 'origin/master'

* origin/master:
  fix bug:application_helper_spec
  complete unit_test
  修改商户积分兑换