edit s3 storage setting for *_uploader.rb!
Merge branch 't1025' into develop