precompiled assets to deploy in heroku
vote_up and vote_down action added to contents controller
votable implemented for content, buttons added to news index and show page
jquery file upload implemented for user photos
resolved conflict