Add a default format if no format is defined in the locale file. Use the same default format as the datepicker gets in the translations partial.

Fixes #3602
While an order_id field exists within inventory_units, we should be able to retrieve these using an association

Fixes #3744

Conflicts:
	core/app/models/spree/order.rb
Add regression test for #3744
Associate user in Order `merge!` when possible

Users might be losing their cart changes when they come back but don't
visit either the /cart page or the /checkout

Fixes #3742
Fixes #3736
Fix path to cart.png

Fixes #3747
Bump to activemerchant 1.38.1
asset-url needs TWO arguments in this branch
Fix product paging issue

Fixes #2851
Fixes #3064

Conflicts:
	frontend/app/controllers/spree/taxons_controller.rb
Fix expectations in order/adjustments_spec so that it now passes
Assign location to shipment when importing orders (api)
Should have ability to ensure confirm step is always in progress bar.
Update credit card factory to work any year.
Fix Order#confirmation_required? spec.
Use Time.now.year as Date.year is invalid.
fix page action buttons line wrap in admin
made shipped_at accessible in shipment model
Revert "made shipped_at accessible in shipment model"

This reverts commit cc356d342730176402b66efd26e0010d9f672c65.
Refactors after_cancel to allow the Mailer method to follow the pattern set in other models.

Allows OrderMailer.cancel_email be sent asynchronously with delayed_job#handel_aynchronously

Fixes #3759
[api] skip authentication before filters for states/countries so that frontend's checkout can work even with requires_authentication=true on the API

Fixes #3762
Optionally trigger an accessibility build.

Set the WEBDRIVER environment variable to `accessible`

[Finishes #3374]

Related to #3414