Updated to spree 2.1.1