file upload errors
Merge branch 'databaseedits'