Merge branch 'master' of https://github.com/cloud-elements/cloud-file-browser