add carrierwave gem
Merge branch 'dev'