Improved photo upload validation.  Bumped up max  upload filesize.
Merge remote-tracking branch 'origin/master'