added aws plugin
working on s3
Merge branch 'master' into dev_server2