fix conflict
Merge branch 'develop' of https://github.com/doki74216/hicloud-s3-java-sdk-testing into develop

Conflicts:
	s3+sdk+unitest/hicloud-s3-sdk-java-testing/bin/initialMPU.class
	s3+sdk+unitest/hicloud-s3-sdk-java-testing/lib/aws-java-sdk-1.3.6.jar
	s3+sdk+unitest/hicloud-s3-sdk-java-testing/src/initialMPU.java
update new jar (remove upload part progresslistener)