upgrade paperclip to fix this bug: https://github.com/thoughtbot/paperclip/issues/1164
Merge branch 'enhancements'