add paperclip with factory girl post
merge origin/source