local uploading bug fixed
upload config added
composer updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
aws sdk added to composer