Upload and resize photos
Merge branch 'photo-edit'