[api] Remove api/v1 directory, move inventory_units controller to correct spot
Revert premature merging of #2414.

Revert "Moved Spree::StoreController class_eval from engine to store_controller_decorator."

This reverts commit 25e3c8521c7eb5a01ac47ca0cd9d5261325d2b43.

Revert "Moved decorators under the app/decorators convention."

This reverts commit 2f5255edbdbb8811c1cca44833389db369153a92.

Revert "Switched decorator loading to the decorators gem."

This reverts commit 689cf55a17e271e73ecd1851a5389d92c2bfc13c.
Move away from using yes/no as keys in translations

This is because they are reserved words in YAML. Best to use keys with a
different name instead.

Fixes #2436
Ensure option values in Variant#options_text are sorted in a predictable order

Fixes #2432
admin product edit: back to products list fix to preserve query params

Fixes #2431
Removed disableSelection() call which was causing problems in Firefox.

Fixes #2432
Changed scope for country name translations

This is done to avoid conflict with label for Spree admin configuration menu.
See issue #2420

Fixes #2421
Allow link_to_cart to be used outside of Spree context

Fixes #2441
Replace product lookups by permalink using where() with find_by_permalink()

This is to aid in compatibility with globalize3

Fixes #2439
Remove not required from main scss stylesheet. Fixes #1963

Fixes #2438
Merge git://github.com/spree/spree