Delted dragonfly and files
Added carrierwave back from Dragonfly for experimental reasons
Needed for carrierwave
Merge conflict