Merge branch 'main' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop

# Conflicts:
#	src/main/resources/data.sql
#	src/test/resources/data.sql
#	src/test/resources/schema.sql