update gem lock
Merge branch 'master' of https://github.com/sufish/wheat-web-portal

* 'master' of https://github.com/sufish/wheat-web-portal:
  wheat-lib branch change
  修改评论为评价
  js bug fixed
  js fixed
  js fixed
  merchant comment

Conflicts:
	Gemfile.lock