Change big variant rabl template to have consistent image structure with small variant rabl template. Fix potentially colliding cache keys.

Signed-off-by: Jordan Brough <git.j@brgh.net>

Fixes #4457
remove mail method configuration

Fixes #4377
Add tax_total back to api_helpers#order_attributes

Conflicts:
	api/app/helpers/spree/api/api_helpers.rb
Use correct c for choose_location
Add missing choose_location, existing_shipments and new_shipment_at_location translations
Set cost in Shipment#add_shipping_method

Running into weird total issues after https://github.com/spree/spree/commit/a7f16ac85ee7b250341eeb131a518922d931dd3d
See failing spec in https://github.com/spree/spree-adyen/pull/3
Append lib_name to dummy databases

Avoid conflict between test databases for spree core and extensions for
example on the same host
Fixes #4447

refactor the order import from being a class_eval on Spree::Order from api to a dedicated importer in spree_core to be reused by other parts. update the year in the licence files, added licence file to spree_core as well since this was missing.

remove the hub part from the build.sh

move this decorator to the correct place again

add the api refactor to changelogs

remove the order_decorator from api and added the method in core order model
Display user addresses form in a separate page
Fix path for overriding spree logo

Fixes https://github.com/spree/spree/issues/4464
Add shipments association to stock locations.
Add Shipment#display_final_price.
Show SOLD OUT if a variant is out of stock

Fixes #4480
Use Spree.t(:out_of_stock) in frontend products/show
Update GS guide to use Rails 4.0.4
[api] Redirect to Orders#show from Checkouts#show

Rather than having two actions that do the same thing, let's just combine all the logic into one.

API users: please use /orders/:num from this point onwards.

Conflicts:
	api/app/controllers/spree/api/base_controller.rb
resolve merge conflict in getting started guide

Fixes #216
Display credit card #name [api]
Add an initial store model

The attributes are all the ones that will be supported for the initial
preferences-onto-store refactoring

Related to #4415
Create a store on new/store migration

Grabbed the defaults from the existing preferences.

Related to #4415