carrierwave fix for s3
Merge branch 'develop'