S3 Upload
Merge branch 'master' of https://github.com/wizard-startup/webclient

Conflicts:
	Estrella/upload.html