Update to spree 2-0-stable