Merge branch '2'

# Conflicts: # admin/src/FileForm.ts # admin/src/VfsTree.ts # frontend/src/router.ts # package-lock.json # package.json # src/listen.ts # src/selfCheck.ts # src/serveGuiAndSharedFiles.ts # tests/config.yaml # tests/test.ts