updates for spree 2.0