modified:   core/app/controllers/spree/base_controller.rb
	modified:   frontend/app/controllers/spree/store_controller.rb