2 1 stable

This branch is working with spree 2-1-stable