pump amos vers
Merge branch 'master' of github.com:spinnaker/amazoncomponents

Conflicts:
	gradle.properties