dataservices-1.0
Merge branch 'master' of https://github.com/emcvipr/dataservices-sdk-java into github_master

Conflicts:
	s3-sample/src/main/resources/.gitignore
dataservices-1.1