Merge pull request #48 from varholl/development

hotfix
Merge pull request #50 from varholl/development

Drive Images
paperclip s3