wheat-lib branch change
登录修改
登录修改
update credit_account_controller
注册修改
Merge remote-tracking branch 'origin/external-interface' into external-interface
修改银行卡
登录调整 用户刷卡明细
用户刷卡明细
修改积分兑现
refactor card segment related feature
Merge remote-tracking branch 'origin/external-interface' into external-interface

* origin/external-interface:
  修改积分兑现
stream line configuration
update user information
注册登录修改
修改积分兑现
注册
update user information,mobile
use rake to do db:migration
Merge remote-tracking branch 'origin/external-interface' into external-interface

* origin/external-interface:
  update user information,mobile
  注册
  修改积分兑现
  注册登录修改
  update user information

Conflicts:
	Gemfile.lock