2 1 stable

Upgrades from spree 1.3 to 2.1.0