#141, #140  When uploading files not to root folder, folders drop down is hidden + single file upload changes
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev