Cleaner paperclip integration
Use last version of paperclip
Merge remote-tracking branch 'origin/edit_attachments' into develop