Bump kaminari to 0.15.0

Conflicts:
	core/spree_core.gemspec
Touch shipment when IUs are updated, and touch order if Payments or Shipments change
Remove extra line from ResourceController#model_class that was added in #3974

This line causes this issue: https://github.com/spree/spree/pull/3974#issuecomment-29130309
Stub touch on mocked Order in shipment_spec
Don't override accessor if model has column already

Say users want to add a `name` column in spree_variants. They can't make
use of that attr on a variant instance because Spree would always
delegate that method to a product.

Now it would only delegate if the model doesn't have that column. That
would be all cases in a default scenario.

Fixes #4012
Move ::Money.extract_cents and ::Money.parse to Spree::Money, as those methods are being deprecated and we care about them.

Conflicts:
	core/lib/spree/money.rb
Include UTF-8 encoding in money.rb
add translation for canceled shipment state

Fixes #4005
[backend] Persist 'only show completed orders' checkbox across pagination requests

Fixes #4004
Add changelog entry for #4004
When removing defunct zone members use classify instead of capitalize when deleting zone members by zonable_type.

When creating a custom zone member type like zip_code for example using capitalize removes all models with zonable type != Spree::Zip_code instead of Spree::ZipCode

Fixes #4001
Inventory Tracking by Variant: fix resource controller model load issue

Fixes #4016
[backend] Make Order number a link back to the order details in all order screens
Ensure payment_state is *really* set to credit_owed when an order is cancelled

Fixes #3711
added autocomplete off HTML5 tag to mail method settings for username and password

Fixes #4036
stock_movements helper fix for stock_transfer

Fixes #4037

Conflicts:
	backend/app/helpers/spree/admin/stock_movements_helper.rb
Only restock on_hand inventory units

Example: Spree restocks items once you cancel an order. However it
shouldn't add stock (restock) items from backordered inventory units.

Conflicts:
	core/spec/models/spree/shipment_spec.rb
Restock items but dont process backorders for canceled orders

Fixes possible issue where canceling an order with backordered inventory
units would make other orders inventory transition from backordered to
on_hand. e.g.

    - create two separate orders of the same item at the same stock location
    - both orders will have shipment state of backorder
    - cancel one of the orders
    - the second order inventory will transition from backorder to ready

Now the second order inventory remains backorder
Only showing unique order records if searching on attributes of associated models like bill_address or line_items

Fixes #3919
Only respond with js if .xhr? is true

Prevents user private data leak for GET requests from other domains
See discussion on rails-core mailing list
https://groups.google.com/forum/#!topic/rubyonrails-core/rwzM8MKJbKU