modify controllers
Merge branch 'master' of https://github.com/DMarvin/sa41252

Conflicts:
	app/controllers/orders_controller.rb
	app/controllers/staffs_controller.rb
	app/controllers/vips_controller.rb