allow specifying Kaminari page_method_name

only define custom page method if page_method_name != page to avoid recursion
Fixes #5035
Use the proper flash

This is not a success
Fixes #5034
Update Google Analytics

Updates GA tracking code to support Display Advertising. See: https://support.google.com/analytics/answer/2444872 for more.
Fixes #5030
Fix order merging. Fixes #5028
Show flash errors for resource controller html requests

and not for js requests.
When a resource controller failed to create/update there was no indication of what had failed.

Also adds "with_model" gem to allow easier isolated testing of `Spree::Admin::ResourceController`.

Fixes #5011
Fixed deprecation config in spec_helper.rb templates (spree_cmd)

Closes #5045
use the variant_full_price on the product show page so the correct currency settings are used. Fixes #4995
Reduce unnecessary DB round-trips.

Spree::Product has after_save :touch in order to fire
the after_touch callback. But as a result, every Save updates
the product twice. There's no need to call `touch`
after a save if all you want to do is fire the after_touch
callback. So I fixed that.

I also fixed `punch_slug`, which gets called after_destroy,
so it does a single round-trip instead of about six.
After a destroy has already happened, it is unnecessary to
validate the product again, call callbacks again, touch the
product again, and fire all cascading touches again.

Closes #5049
fix failing specs with variant price
refactor the variant price for product.js.coffee. Thanks @gmacdougall
Merge pull request #5063 from danielwestendorf/optimize_backend_products_query

Remove tables from includes on index query which are not needed an resul...
Wait ajax request a bit for backend spec fix
Include spree_current_user on custom user template

spree/api expects either spree_current_user or an api token to
authenticate users. Since backend no longer sends the api token we need
to make sure custom auth apps have spree_current_user available in api
component
Allow users address assignment over API.
Add data-hooks to the admin order detail side menu

Fixes #5086
Refactor ensure_updated_shipments call to be within the OrderContents and OrderPopulator classes to ensure consistency. Fixes #5082

Conflicts:
	core/app/models/spree/order.rb
	core/app/models/spree/order_populator.rb
	core/spec/models/spree/order_populator_spec.rb
	frontend/app/controllers/spree/orders_controller.rb
Add API to get credit cards for a specific user.

Fixes #5077
Fix whitespacing.
If ShippingCalculator has an empty string currency, it matches to all currencies

Closes #5097
Validate uniqueness of order numbers... Why was this FIXME never fixed until now... Fixes #5102