#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
Merge branch 'master' into dev
#128: post-build script updated.
#128: post-build script updated.
#128: unused file removed.
Merge branch 'dev'