Add carrierwave
Merge branch 'development' of https://github.com/woohoou/angelhack into development