Change Carrierwave-Dropbox back to Carrierwave
Merge branch 'master' into openshift