Fix bug - carrierwave initializer shouldn't run in test
Merge branch 'master' into cp-view-reviews