Merge branch 'main' of https://git.cardiff.ac.uk/d1634883/client-project into...

Merge branch 'main' of https://git.cardiff.ac.uk/d1634883/client-project into 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details

# Conflicts:
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
#	src/main/resources/templates/fragments/Templating.html