ACL was throwing an error for AWS
Merge branch 'master' of github.com:rangle/mentor-hack

Fetching and merging - hotfix for ACL on image uploads