restrict cost_price to admin users through the api
Fix typo in item_adjustments
Make sure cart adjustments partial gets rendered if there are shipments.
Update edit.html.erb
Order summary view checks if delivery step has been passed in the checkout flow before displaying any shipping charges.
Merge pull request #5056 from jschwertfeger/fix/show-cart-adjustments-if-there-are-shipments

Make sure cart adjustments partial gets rendered if there are shipments.
Merge pull request #5058 from owainlewis/master

Allow users to edit email address
Merge pull request #5053 from jschwertfeger/fix/show_order_shipping_charges_after_delivery_step

Check if past delivery step before displaying shipping charges in order summary
Order#checkout_step_index always return a integer
Merge branch 'api_hide_cost_price' of github.com:godaddy/spree into godaddy-api_hide_cost_price
Load current user roles on api requests
Remove tables from includes on index query which are not needed an result in bad performance with many Variants
Add admin flag on variants related cache template

We want to make Variant#cost_price only available for admins so we need
to make sure difference cache keys are set as per current user role
otherwise the first template cached would decide whether or not the
attribute would be available (rather than the user role itself)
Merge pull request #5063 from danielwestendorf/optimize_backend_products_query

Remove tables from includes on index query which are not needed an resul...
Merge pull request #5052 from brchristian/patch-6

Fix typo in item_adjustments
Order history should be by completed_at, not created_at

Otherwise, orders that use an old cart appear way out of order. This
will show completed orders first, ordered by completed_at desc, then the
rest ordered by created_at desc.
Merge pull request #5029 from bonobos/order-by-completed-at-master

Order history should be by completed_at, not created_at
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