Only validate the month/year for CC info if there is no payment profile
A payment profile can either be a customer id or a payment profile id
Only show last digits on payment form if they exist
Introduce channel attr to Order model

Could be set when importing orders from other storefronts

Conflicts:
	api/CHANGELOG.md
	api/spec/controllers/spree/api/orders_controller_spec.rb
	core/CHANGELOG.md

Conflicts:
	api/CHANGELOG.md
	api/app/controllers/spree/api/orders_controller.rb
	api/app/helpers/spree/api/api_helpers.rb
	api/spec/controllers/spree/api/orders_controller_spec.rb
	core/CHANGELOG.md
Make line_items attr handle more flexible on api

When importing orders or creating orders and line items at once the
line_items key on order payload would provide an array not a hash. The
API need to consider then that both hash and array might be provided and
handle it gracefully

Conflicts:
	api/spec/controllers/spree/api/orders_controller_spec.rb
Add sku to line item attr_accessible

Allow users to find variant by sku when importing orders

Conflicts:
	api/app/models/spree/line_item_decorator.rb
Add `ship_total` to api order_attributes
Make OrderInventory aware of `track_inventory_levels`

It should not create backordered inventory units when it is set `false`
Update all adjustment types

In f9ed99a the order updater was changed to update only shipping
adjustments and promotion adjustments. This was done so that the
in-memory order was used for promotions calculations.

This broke some extensions which expected their custom adjustment types
to receive updates.

This goes back to the previous behaviour of updating all adjustments,
but uses the in memory order object if it is the adjustment's source.

Fixes #3960
Replaced Taxon :position refs with :child_index=

Fixes #3390
Fixes #3956

Taxon position unnecessarily fights against the awesome_nested_set
API. By using a_n_s's :move_to_child_with_index method we can more
fully leverage acts_as_nested_set.
Not attempting to reorder taxon on create since awesome_nested_set refuses
Bump to activemerchant 1.42.2

Conflicts:
	core/spree_core.gemspec
Bump aws-sdk to 1.27.0 to remove restriction for Nokogiri < 1.6
Bump to Deface 1.0.0
Update changelogs
Bump Rails version in README
Bump to 2.0.7
Bump to 2.0.8.beta
Blank out changelogs
Query only valid payments for order confirmation_required?

Prevent a confirmation step in cases where a previous selected payment
method which required confirmation failed and customer picked one that
doesnt require confirmation next

Fixes #3970