Photo uploading. Still doesn't work, being shelved for now.
IMG upload works! Still need to save the user and location of the cache, but that can come when users on iPhone are hammered out
Merge conflict resolution
Merge branch 'server-photo-upload'

merge conflict resolution