added carrierwave functionality
fixed campaign controller merge