Make use of before filter instead of grabbing product inside method body

Fixes #1387
fix invalid method call on gateway connection error

Fixes #1383
Add documentation to provide a 'find location' for the product_image helper and associates
Simplify `set_available_option_types` routine a little bit

Fixes #1388
Revert "Refactor layout templates"

This reverts commit 02a5d68e834b4c2429c94425f1826ca8c276df6d.

Conflicts:

	core/app/views/spree/layouts/spree_application.html.erb
Removed redundant variable assignment

[Fixes #1391]
Fix spelling of 'Calculator' (was 'Caclulator').

[Fixes #1389]
set attr_accessible in gateway model to allow updating payment method settings

Fixes #1386, merges #1393
Add id to line_item_attributes
Add id to attributes in line items controller
Correctly show line item attributes on new and show API templates
corrected an issue with Add To Cart button not working on IE7 (requires type="submit")

Fixes #1397
include shipping and billing address for order show
countries api, countries include states
adding original to deface override
too early in the morning for typos like that
Bump paperclip version to 3.0.2
Use Paperclip 2.7 since 3+ requires Ruby 1.9
Remove deprecated product_price method
Add deprecation warning to Spree::Variant.additional_fields and fix #1406