Avoid name clashing when including modules

Conflicts:
	core/app/models/spree/order.rb