tracks changes in issue 4322
Merge branch 'payment-update-4322' into 2-0-stable
Depend on Rails 3.2.17
deleted products should not be available?

Fixes #4362
Fixes #4437
use authenticated url for option_type_autocomplete

option_type autocomplete wasn't using the authenticated url helper.  Updated to mirror how taxon_autocomplete
works.

Fixes #4368
Update payment state not only when order is completed

Fixes #4322
Fixes #4441
Stub out correct call in users_controller_spec to set the current user
[api] Use Rails 3 friendly syntax for authorize_for_order
[api] Stub current_api_user, not try_spree_current_user for users_controller_spec
[api] Refer to order object, not @order within LineItemsController

@order is not set in this context until the order method is called.
Properly call Product#destroy. Fixes #3659

Conflicts:
	api/app/controllers/spree/api/products_controller.rb
Include fontawesome on the list of assets to be precompiled by the asset pipeline

Fixes #4399
Using `find_each` instead of `all.each` to improve memory

This syntax will run our migration over the `Spree::StockTransfer` model in batches, which will improve performance on stores with high numbers of stock transfers.

Fixes #4473
Use `find_each` rather than `all.each`

Perform the CreateDefaultStock migration in batches to lower memory footprint.

Fixes #4475
typo fix in CreateDefaultStockMigration

Fixes #4474
Improving performance via find_each and includes() in UpdateAdjustmentsStates migration

Fixes #4459
Fixes #4468
Removing .includes() call from MigrateTaxCategoriesToLineItems

Addresses the bug discussed in https://github.com/spree/spree/issues/4460

Note that this will make the migration slower, but less buggy in the case that LineItems refer to deleted Variants or Products.

If the `acts_as_paranoid` gem can be modified to allow "unscoped" `includes()` calls, then we can reinstate the performance improvement.

Fixes #4460
Fixes #4471
Fixes issue where deleting and creating product properties at the same time caused an error on the product page stating the product could not be found.

When deleting a product property it was deleted from the database and the row was hidden (not removed) on the frontend. On submitting the form, the now deleted property id was still present causing the error when trying to load the property with that id from the database.

Fixes #4467

Conflicts:
	backend/spec/features/admin/products/properties_spec.rb
Add currency to ApiHelpers#order_attributes

As per #4462
Don't assign shiping_category if it exists

Fixes #4401