Restore upload/new folder buttons
Automated merge with ssh://bitbucket.org/stephenmcd/filebrowser-safe
Version bump to 0.2.22