fix carrierwave s3 fog configuration
Merge branch 'master' of heroku.com:markibles-app
update gemfile.lock