upload validation updated for more types of files
Merge remote-tracking branch 'origin/master'