Documentation to integrate Paperclip
Merge branch 'master' into paperclip-integration
Merge branch 'paperclip-integration'