Fixed bad selector in address.js.coffee
change selected class onclick rather than onmouseout
Add missing translation

can be seen if you edit photos for a product with no photos in the the backend.
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]
Merge pull request #4962 from Dkendal/master

Add missing translation
Re add :id to address permitted attributes

Previously introduced in 681a966f and later removed probably by accident
Merge pull request #4946 from dmarsupastar/thumbnail-selection

change selected class onclick rather than onmouseout
Merge pull request #4942 from callumacrae/address-selector-fix

Fixed bad selector in address.js.coffee
Always store the pre_tax_amount for the provided item

Allows access to pre_tax_amount regardless of whether the item has included tax or not.

Closes #4945
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.