Fix copy/paste mistake.
Merge pull request #4923 from jordan-brough/fix-order-reload

fix Order#reload method signature
Fix line item proper currency check
Merge pull request #4962 from Dkendal/master

Add missing translation
Revert "Add pry and pry debuggers to common spree dependencies"

This reverts commit 7c367d5ca0e2f293813278a0e37d9f731aa8befb.

CI breaks with these errors: (lack of ruby 2.1 apparently)

  [03:52:55][Step 1/1] in directory: /mnt/72aec43634788be0/core
  [03:52:55][Step 1/1] `ruby_21` is not a valid platform. The available options are: [:ruby, :ruby_18,
  [03:52:55][Step 1/1] :ruby_19, :ruby_20, :mri, :mri_18, :mri_19, :mri_20, :rbx, :jruby, :mswin,
  [03:52:55][Step 1/1] :mingw, :mingw_18, :mingw_19, :mingw_20]
  [03:52:56][Step 1/1] `ruby_21` is not a valid platform. The available options are: [:ruby, :ruby_18,
  [03:52:56][Step 1/1] :ruby_19, :ruby_20, :mri, :mri_18, :mri_19, :mri_20, :rbx, :jruby, :mswin,
  [03:52:56][Step 1/1] :mingw, :mingw_18, :mingw_19, :mingw_20]
  [03:52:56][Step 1/1] `ruby_21` is not a valid platform. The available options are: [:ruby, :ruby_18,
  [03:52:56][Step 1/1] :ruby_19, :ruby_20, :mri, :mri_18, :mri_19, :mri_20, :rbx, :jruby, :mswin,
  [03:52:56][Step 1/1] :mingw, :mingw_18, :mingw_19, :mingw_20]
Move set_shipments_cost call to Order#update_from_params

This stops the method from being called whenever Order#checkout_steps is called and thereby reduces some queries

This needs to be called in the checkout_specs to ensure that the state isn't jumped as long as this method is called.

Fixes #4898
Fixes #4979
Shipment cost is now included in spec totals.
Merge pull request #4977 from alexandremcosta/fix_promotion_spec

exchange expires_at to starts_at to fix test
Merge pull request #4974 from bonobos/fix/admin-payment-method-switch

Fix admin payment form not being displayed on payment method change
Add blank to ShippingMethod's TaxCategory select

Addresses https://github.com/spree/spree/issues/4914

Now ShippingMethods whose `tax_category` is `nil` will display a blank selector rather than falsely displaying the first TaxCategory in the system.

Note that due to the UI implementation it appears to be impossible to return to selecting `nil` after a TaxCategory has been selected.
Merge pull request #4986 from athal7/remove-api-token

Remove js api key that was missed during 2469735fba9720d4cb0895576a197a3...
Include Store in ControllerHelpers.
Set missing credit card attributes when possible. Fixes #4972
API Orders#show should only return the order json. Fixes #4979
Use prepend_before_filter to try calling before apply_coupon_code. refs #4926
Switch to cancancan to fix issues with custom abilities being unable to properly initialize sprees namespaced models.
Added missing translation for back_to_shipping_categories_list

Fixes #4993