Implement carrierwave
Merge branch 'carrierwave'