Closes #314: Ensure different thumbnail sizes are given different file names and IDs when using disk file store.
Merge pull request #320 from mapkyca/fixing-thumbnails

Fixing photo upload picture sizes