[MARKET PLACE] merge into spree