Bump paperclip back down to ~2.7.0

2.7 is the one getting long term support, and spree isn't
upgrading to rails 3.x to keep ruby 1.8.7 compatability

Change-Id: Idc743492e58cad3f5ea28edd82a87611ff98c10e
Allow users to not override default mailer configs

Fix from_address logic in mailers, it broke when there were no
mail_method record on the database.

Cherry-picked from spree/1-3-stable.

Change-Id: Ieb090c923ba248832d946337f9f912571fc38847
Support .name and .description on line items

This allows line_items to override and control what should be used for
description and name sanely.

The extra helper isn't ideal, but we do maintain the old interface for
extensions.

Conflicts:
	core/app/helpers/spree/products_helper.rb
	core/app/models/spree/line_item.rb
	frontend/app/views/spree/orders/_line_item.html.erb
Deprecate truncated_product_description(product)

in favor of truncated_description(text)
Use name and description on LineItem
send proper cents to gateway
Remove object_params

This is a back-port of work done against master.

Conflicts:
	core/app/controllers/spree/checkout_controller.rb
	core/app/models/spree/order/checkout.rb
Only sum adjustments that have values
Add customer id to gateway options
Minor refactor: extract gateway order id to method

This will allow people to more easily override the order id passed
in to the payment gateway.  It will behave the same for existing
functionality.

Fixes #2732

Conflicts:
	core/app/models/spree/payment/processing.rb
Fix edge cases: change completed/deleted orders

Fixes https://www.honeybadger.io/inspector/p/33208/2350688

Also fixes another edge case discovered at the time of debugging.

Change-Id: Ia69ec3540af095c0209909ec02c26dda9d7f3e73
Update orders_controller_decorator.rb
Reintroduce this, it was deleted during the rebase.

Change-Id: I72b74b716561d7aa64ccb2f12f3f796b50fad919
Fix rebase mishap.

Change-Id: Id90b7b4b85acecdd8152a1a3b66dc9e079a55e6e
Use I18n.t not Spree.t.
Merge pull request #1 from camelmasa/1-3-rebased-clean

Remove some commits.