added amazon s3
Merge branch 'dev'