Fix simple_current_order to not conflict with order. Fixes #4611
Fix simple_current_order to not conflict with order.
Fixes #4611

Conflicts:
	core/lib/spree/core/controller_helpers/order.rb

Hates/spree,Hates/spree,Hates/spree,Hates/spree