更新Gemfile.lock
继续完善place
Merge branch 'master' of github.com:fengkan/camera

Conflicts:
	app/controllers/orders_controller.rb