working on file upload
check for FileUploadOptions before trying to use it
Merge branch 'backup' into develop