Merge branch 'master' into promo
Merge branch 'glen-tags'
Merge branch 'promo'
merging branch no_eng
removing the split method from query set in Spree code
merging branch full-match-search