first update for spree 2.1
merge old master
Merge in changes from upstream
Fix BannerBox model to always use SpreeBanner::Config for preferences