added full paperclip functionality
resolve schema conflicts
fixes merge conflicts
Merge branch 'add_photos'