Upload in progress
Merge branch 'upload_photo' into develop
Working upload of photo
Update finished
Merge remote-tracking branch 'origin/develop' into develop
Working edit feature