Added configuration option to disable S3 storage
Added contentLength property to improve
Updated aws-java-sdk to version 1.3.6