Port to Spree 2.0.0.beta

Port to Spree 2.0.0.beta