fixed master
fixed carrierwave/fog
Merge branch 'master' into develop