rebase

Git rebase package.json conflicts: regenerate npm package-lock.json with "npm install --package-lock-only"