last commit for heroku and s3
all seems to be working with heroku and S3
Merge branch 'develop'