Fixes messaging after applying coupon code promo with CreateLineItems action. Fixes #4697
Refactor Spree::ProductHelper#variant_price_diff

* Change the logic of the code to make it easier for the next
  commit.
* Remove duplicate code from the HTML generation.

Change #variant_price_diff to handle when the product amount is nil

Fixes #5493
Add required attributes to required product admin form fields

* Adjust spec example inputs to allow submit with that restrictions.

fixes #5496
make bogus gateway match actual gateways. ie. don't assign profile id for failed payments

fix handling of retry payments and multiple payments

fixes #5499

Conflicts:
	core/app/models/spree/payment.rb
Make some strings on admin product edit form translatable
fixes #5500
Fix displaying product & taxon names when meta_title present.

Fixes #5502
Fixes #5501

Conflicts:
	frontend/app/controllers/spree/products_controller.rb
Revert "Fix displaying product & taxon names when meta_title present."

This reverts commit ff64cca25080555636254be7f792539c287c0273.
Depend on factory_girl_rails 4.5.0
We need to be more restrictive with factory girl updates.
Implement a state lock version to prevent race conditions in checkout controller. refs #4190

Fix broken specs.

Add regression test for state lock version. Fixes #4190

Conflicts:
	frontend/spec/controllers/spree/checkout_controller_spec.rb
Add circle CI setup

fixes #5506
Use includes instead of eager_load to ensure images are returned in correct order.

Fixes #5513
include option values when loading option values from option types
fixes #5519
stack level too deep in rails 4.1.6
filter out shipment json data to avoid stack level too deep error in rails 4.1.6
add :state and :store_location_id to shipments js array

fixes #5504

Conflicts:
	backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb
be more verbose with the missing migrations
Use js driver to fix spec.
Refactor the duplicate request prevention code ( order.with_lock )
- break the lock code out into a seperate callback
- ensure it only operates on an update
- add specs

Refactor & Bugfix
- Correcly name the callback that prevents duplicate requests
- Add a spec to test that the callback is being called

Fixes #5523

Conflicts:
	frontend/app/controllers/spree/checkout_controller.rb
clean up stock location form design

refactor field class of divs to parent div

add data-hooks for stock locations

Fixes #5525

Conflicts:
	backend/app/views/spree/admin/stock_locations/_form.html.erb
Default is 2.4.x+
Adds editorConfig.

Fixes #5491