Merge remote-tracking branch 'origin/74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details' into businesses

# Conflicts:
#	src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
#	src/main/resources/WorkWith/local-authorities.html
#	src/main/resources/data.sql
#	src/main/resources/schema.sql

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

Merge branch '70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my' into 'main'

Resolve "As a repeat trail visitor , I want to be able to create an account so I can save and review my progress."

Closes #49 and #70

See merge request !37

Merge remote-tracking branch 'origin/70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my' into 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my

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

Merge branch 'main' into 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my

# Conflicts:
#	build.gradle
#	src/main/resources/data.sql
#	src/main/resources/schema.sql

Merge branch '52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go' into 'main'

Resolve "As a user I would like to see a map of the landmarks, so that I can figure out where to go"

Closes #52

See merge request !30