Check for existence of variant_images in _thumbnails partial
Target correct form class name in checkout.js

Fixes #1905
Freeze to kaminari 0.13.0 until amatsuda/kaminari#280 is fixed
Strip trailing slash for dash analytics header override
Fix postgres orphaned preferences SQL

Quoting fields/reserved keywords with backticks is only allowed in MySQL,
while single quotes are supported by both databases.

Fixes #1904
Upcase SQL syntax
Fix missing sass-rails dev dependency for extension gemspec

Fixes #1874
defect fix checkout address state not displaying

Merges #1947

Fixes #1937
Remove commented out pending line from preferable_spec.rb
if preference is not found, fallback to DB before falling back to default

Fixes #1500
Check if preferences table exists before falling back to DB.

Fixes this broken build: http://travis-ci.org/#!/spree/spree/jobs/2435037
Don't show deleted ShippingMethods by default

Fixes #1847

Fixes #1967
Don't render partial for order state in API if it doesn't exist

Fixes #1992
Remove 1.9 'workarounds' that have been in place since 2009

These issues are more than likely fixed by now.
- return correct configuration values regardless of cache status

Fixes #1985
Fixes #1996
Add mail_server_settings[:tls] setting to mail_settings

Fixes #2003
Tidied code inside preferences/store.rb

* Methods always return nil in the absence of an explicit return.
* In-lined Preference retrieval and presence check.
* In-lined cache read presence check.

Fixes #2005
Check for persistence availability before checking DB for preference key
Remove duplicate sass-rails dependency.

Fixes #1990
Move admin translations out of assets and into a special view

That special view is app/views/spree/admin/shared/_translations.html.erb. This file is loaded along with the assets in the <head> tag of the admin layout and defines some JavaScript variables under the 'Spree.translations' 'namespace' which can then be used inside the admin assets.

This *may* cause #1906 to no longer be a problem.

Conflicts:

	core/app/assets/javascripts/admin/admin.js.erb
	core/app/assets/javascripts/admin/product_autocomplete.js.erb
	core/app/views/spree/admin/shared/_head.html.erb