Don't return a tracker unless an analytics id is present
Use update_attributes inside "should undefeault the previous default tax category" spec ,as we *do* care about callbacks in this instance
Don't call determine_state twice in Shipment update
Rename update_attribute_without_callbacks stubs to update_column in shipment spec
Fix min-height for main image on product show page

Fixes #1800
touch completed_at when finalizing an order, rather than using update_column
Correctly use update_column and not update_attribute in 'should freeze optional adjustments' test
Correct stub in order_spec for touching completed_at when finalizing
Don't rely on specific method calls in shipping_methods_controller_spec
Sitemap for products

[Closes #1802]
Add test for Spree::ProductsController#sitemap
Add (s) into product in test description [ci-skip]
Refactor ContentController#cvv and add test
Fixed products not being displayed for a taxon when that taxon had children

Fixes #1796
[api] Prepend app's view path to view path lookups so views can be overriden

Fixes #1804
Move S3 handling code into Spree::Core::S3Support

This means that you will only need to modify it in one spot now, rather than in Image and Taxon
Refactor referer-matching taxon-finding code in ProductsController#show

Fixes #1803.
Check for referer before attempting to parse as URI
Order#products already exists in Spree::Core so remove from Spree::Promo Order decorator.

Fixes #1805
Index tables using js 'drag and drop sortable functionality' (i.e. images, variants and option_types) must define tbody, if not TRs can be dropped above the THs resulting in ugly views

[fixes #1455]

Merges #1456