add paperclip with amazon s3
fix pull request issues
fix pull request issues
fix pull request issues