Merge branch 'refs/heads/main' into feature/entityText

# Conflicts:
#	components.d.ts
#	index.html
#	package-lock.json
#	src/App.vue
#	src/components/LogoAndLabel.vue
#	src/pages/HomePage.vue
#	src/stores/data.ts