Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can

# Conflicts:
#	build.gradle
#	src/main/java/Team5/SmartTowns/data/LocationRepository.java
#	src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
#	src/main/java/Team5/SmartTowns/data/TrailsRepository.java
#	src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java

Merge branch '68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path' into 'main'

Resolve "As a user I would like to see a map containing all landmarks for a trail and a suggested path between them, so that I can easily follow the trail"

Closes #68

See merge request !40

Merge branch 'main' into 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path

# Conflicts:
#	build.gradle
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
#	src/test/java/Team5/SmartTowns/DataSourceConfig.java
#	src/test/resources/application.properties

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