Fixed error handling, and added more to file upload
Merge branch 'master' of https://github.com/Web-Forms-Team-Vladimir-Nabokov/Web-Forms-Team-Vladimir-Nabokov