first update for spree 2.1
merge old master