folder upload handles > 2 photos
Merge branches 'folderfix' and 'master'