spree update
Merge pull request #1 from tesserakt/2-2-stable

spree update