Added proper content type for the S3 upload
Implemented upload on server
Little tuning/r&d with S3