Merge pull request #1100 from bdonald25/bdTemp

Better error messages
pictures app no longer says upload failed when it is successful