add blockUi when file uploading
Merge branch 'blockUI' into develop