update controller, fix paperclip
fix heroku merge