Fixed small bug of file uploading but not showing
Merge branch 'master' into scrub-dev