add carrierWave upload
Merge branch 'develop' of https://github.com/pobing/woji into develop