support s3
Merge branch 'master' of github.com:JohanB/spree_slider