Lock jquery-rails to 3.1.0 as 3.1.1 breaks data-confirm. Fixes #4892
Only destroy tax adjustment for open order when the associated tax rate is deleted. For closed order just nullify the source_id.

Update line_item & order when adjustments are deleted.

Add rspec tests to cover cases where adjustments get (or not get) destroyed when taxrate/promotion is deleted.

Move deals_with_adjustments to a separate mixin.

Add new mixin to core

Revert previous changes to remove unnecessary tests.

Remove order.update! and simplify rspec.

Fixes #4828
Fixes #4771

Conflicts:
	core/spec/models/spree/tax_rate_spec.rb
Merge pull request #4900 from reinaris/patch-3

adjustment_state (icon) returns 'fa fa-lock'
When creating shipment assign orders shipping address. Fixes #4915 Fixes #4654
Payment methods should be scoped to available.
make incl/excl in ShippingRate#display_price translatable

Fixes #4894
make click_and_drag_on_the_products_to_sort_them in spree/admin/taxons/index translatable

Fixes #4894
Info for products with multiple variants

Setting SKUs for products with multiple variants can be confusing for novice users.

This adds a note on the product form in the place where the SKU field would normally appear. It lists several variant SKUs and invites the user to manage product variants.

Fixes #4897
Bump to Rails 4.1.4
Added without_children = true in taxon autocomplete API Call

We do not need taxon children in autocomplete of product taxons. As we were loading taxon children the response of the API call was slow.

Fixes #4903
Optimize available_countries

Use .sort_by so that we only run .parameterize once per country.

Fixes #4899
Destroy associated adjustments when order is changed to move out of taxable zones.

Fixes #4840
Fixes #4839
Fixes #4916
refactored and fixed tax rate spec

Fixes #4839
Fixes #4840
Fixes #4916
Permit first_name and last_name in address attributes

These parameters are aliases for firstname and lastname, and so should be permitted through as well.

This used to work in 2-2-stable, but was broken as of 2-3-stable.
Allow setting user_id on order create. Fixes #4922
Need to permit attribute.
Provide gateway profile info for admins. Fixes #4953
Add pry and pry debuggers to common spree dependencies

Including dev environment.

Fixes #4957
[api] Do not wrap parameters in OrdersController

This fixes the problem where POST /api/orders with no parameters would result in the parameters coming to the controller as params[:order], courtesy of this:

https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/params_wrapper.rb

Disabling it means that we can't submit JSON parameters without a root element, but really we don't advise people to do that, so I think it's a small thing to lose

Conflicts:
	api/app/controllers/spree/api/orders_controller.rb
Need to call to_s on payment_method_id in Order::Checkout.update_params_payment_source

For identical reasons to 5cef30bc9b28600dcaf2803c74b79d2549ba8b46