API for inventory_units (show & update), fire state transitions
return 422 for API processing exceptions
Fix incorrect shipment calculation

This issue exists for orders that split up their shipments over two or more shipments.

What happens is that when a shipment is created for a single line item,
the price of that shipment is x. The second time a shipment is created,
for a different line item for the same order, that second shipment's price
 is also x, but the first shipment's price is set to
<shipping cost>*<line items count>, due to the automatic adjustment
updating for an order.

To fix this, we lock the adjustment for any 'calculated adjustment', so
that it may not change once it has been calculated. An admin *may*
choose to override the amount in the interface after the fact.

Fixes #1606
Add missing equal sign for admin_shipping_method_form_availability_fields

Fixes #2310
Use correct key for datepicker translation
Allow first order for user promotion to work with guest users as well

Fixes #2306
Always show resend button when viewing an order

Even for guest orders

Fixes #2318
Make sure that shipment for resumed order can be set to ready

Fixes #2317

Conflicts:

	core/app/models/spree/shipment.rb
	core/spec/models/order_spec.rb
	core/spec/models/shipment_spec.rb
Fix issue where PerItem calculator would fail on promotions that had rules which did not respond to the "products" method

Fixes #2322
Revert "Fix incorrect shipment calculation"

This reverts commit 785161c3

As per comment:
https://github.com/spree/spree/issues/1606#issuecomment-11440193 and
issue #2328.
Add field for attachment_url preference to image settings page

Fixes #2344

Conflicts:

	core/app/views/spree/admin/image_settings/edit.html.erb
Remove commented out lines from payment factory
Bump ActiveMerchant dependency.

Fixes #2346
Depend on Ransack 0.7.2

This is due to ernie/ransack#176.
Use localized error message for email validator

Fixes #2364
Fixed issue with duplicate thumbnails on ProductController#show

Fixes #2361
Updated paperclip rake command with proper class info for spree.

Fixes #2369
Correct Taxon class reference in taxon.rake

Fixes #2370
Make admin/orders/shipments_spec.rb not dependent on a checkbox's id
Auto-orient uploaded images based on EXIF data

Fixes #2338