fix ajax-file-upload bug
Merge branch 'master' into gh-pages
fix ajax-file-upload bug
Merge branch 'master' into gh-pages