update
remove credentials
update
Merge remote-tracking branch 'origin/master' into ios

Conflicts:
	.gitignore
	src/main/resources/AwsCredentials.properties