Added ability to upload images via paperclip
disabled images for the time being
Fixed merge conflicts