Replace number_to_currency with Spree::Money.new (as per https://github.com/spree/spree/pull/1829)
Fix javascript for updating product price - trim master_price before parsing
Use new shipments create method for set_default_shipping_method
Update comments