fixes for folderUpload
Merge branch 'master' into js-bugfix
Merge pull request #577 from nla/js-bugfix

Js bugfix