demo
fix conflict
Merge branch 'develop' of https://github.com/doki74216/aws-sdk-java into develop

Conflicts:
	bin/com/amazonaws/services/s3/AmazonS3.class
	src/main/java/com/amazonaws/services/s3/AmazonS3.java