Added in logic for photo upload and progress indicators
Fixed conflict
Merge branch 'master' into erica