Merge branch 'dev'
fixing merge conflicts
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
fixed resizings
pulled new dev
added admin for seed data
added authorizations guest
fix conflicts
commented display of profile picture in show user
seed data added
fixed conflicts
added validation in album
committing part debugged multiple provider oauth
adding placeholder images
resizing upload photos
committing working multiple provider oauth
fixed resize profile image
committing multiple providers with redundant model deleted
committing no changes
uploader edit