update for carrierwave ~leph
Merge branch 'master' of https://github.com/crowdpublishtv/alpha