fixed s3 conf
Merge branch 'develop'