make sure we load the promotion rules after initialize so the user rules are correctly saved. also remove the after_save on promotion, this is no longer needed.
[api] Passing without_children=1 to taxons endpoint will now return a 'shallow' result set without children

Fixes #4112
Only show orders/mine for persisted users
[backend] remove reference to removed anonymous? method in customer_details/form
make sure we use the proper check for checkout steps to render the shipment state

Fixes #4107
Fix issue where checkout failing on confirm step would redirect back to address step

Fixes #4117
Add migration to ensure shipping method categories are unique

Related to #4102
Remove duplicate join record creation

Related to #4102
Refactor shipping method creation to use a single method call

Related to #4102
Change package to return common shipping methods

* The previous code would return shipping methods that only applied
  to one of the shipping categories in the package. IMHO the more
  correct approach is to return only the shipping methods that are
  common between all the shipping categories.
* The #to_a at the end handles the case where the shipping
  categories are empty, so that an empty Array is returned rather
  than nil.

Related to #4102
Allow paging and order filtering on the mine endpoint

Fixes #4099
Get orders through current_api_user

From #4099
[api] Add ability to get properties by id

Fixes #4091
Create a payment for 'double clicking confirm' test in checkout_spec

This is now necessary to reach the confirm step, due to #4117
adds div data-hook='cart_container' as a containing element to the cart view to make it easier to interact with via deface

Fixes #4119

Conflicts:
	frontend/app/views/spree/orders/edit.html.erb
removing commented <h2> on admin area

Fixes #4109