Fix git conflict.
corrects fetch_cart urls
Fixes #5325
removes window.location.origin

isn't compatible with Internet Explorer

Fixes #5323
Revert "Only cancel cancellable shipments."

This reverts commit a1daea003802c1bd71ad9db4540ecd29c45283d1.
Dont create product if master variant invalid.
[Fixes #5306]
Fixes #5330
addi18n to prom index
Fixes #5333
Update jquery dep. refs #3203
RSpec 3.1 support & Fix a couple Rails 4.1.6 regressions.

Conflicts:
	api/spec/controllers/spree/api/base_controller_spec.rb
	api/spec/controllers/spree/api/promotion_application_spec.rb
	api/spec/controllers/spree/api/promotions_controller_spec.rb
	common_spree_dependencies.rb
	core/spec/lib/spree/core/controller_helpers/search_spec.rb
	core/spec/lib/spree/core/controller_helpers/store_spec.rb
	core/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
	core/spec/models/spree/customer_return_spec.rb
	core/spec/models/spree/order/checkout_spec.rb
	core/spec/models/spree/order/payment_spec.rb
	core/spec/models/spree/order_spec.rb
	core/spec/models/spree/promotion/actions/free_shipping_spec.rb
	core/spec/models/spree/promotion_spec.rb
	core/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb
	core/spec/models/spree/reimbursement_type/credit_spec.rb
	core/spec/models/spree/reimbursement_type/original_payment_spec.rb
	core/spec/models/spree/return_item/default_eligibility_validator_spec.rb
	core/spec/models/spree/return_item_spec.rb
require at least one valid payment on transition to complete
Fixes #5350
Always lock payment as processing for credit action
Raise an error if payment is already processing.
Set back to completed.
Reduce queries whenever _products are rendered.
Fixes #5352
Fix spec.
let value have validation of db column length

need to rescue AR issue for spree install, ci, etc (chicken and the egg issue)

do validations as a re-useable validtor

explicit argument error message
Fixes #5361
OrderPopulator doesnt have to call shipment update as OrderContents handles that.

Conflicts:
	core/app/models/spree/order_populator.rb
	core/spec/models/spree/order_populator_spec.rb
Fix spec expectation.
Use email regex from Devise. Fixes #5368
Revert "Added ability to perform address actions outside scope of an order"

This code is unreachable in stock spree because there is no route to get to Api::AddressesController without going through an order.
And the unreachable code is insecure by default -- if a store did add an "/api/address/:id" route then any Api user would be able to read any other user's addresses simply by guessing the id because that's how the permissions were added in ability.rb.
It seems like it would be better to just remove this or else make it a fully supported, reachable, and secure endpoint in stock Spree.

This reverts commit 229cdf4284fa56528a06c0c86830b19a7f49c3df.

Conflicts:
	api/app/controllers/spree/api/addresses_controller.rb
	core/app/models/spree/ability.rb

Fixes #5375

Conflicts:
	guides/content/api/addresses.md
Add data-hook to password fields on user form
Fixes #5377