modify file type and size in fileupload
Merge branch 'school_dev' into school