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/java/Team5/SmartTowns/data/TrailsRepository.java
#	src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
#	src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
#	src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
#	src/main/resources/static/css/homePageStyle.css
#	src/test/java/Team5/SmartTownsOld/DatasourceConfig.java
#	src/test/java/Team5/SmartTownsOld/users/UserTests.java

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

Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"

Closes #69

See merge request !34

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"

"Merging with main"

Merge branch '80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find' into 'main'

Resolve "As a convenience enthusiast, I want a drop down menu to be able to quickly scan QR codes I find along my dragon trail so that I may continue on my adventure without disruption."

Closes #80

See merge request !41

Merge remote-tracking branch 'origin/main' into 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find

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:
#	src/test/java/Team5/SmartTownsOld/placeswithcoordinates/PlacesCoordinatesTest.java

Merge branch '82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness' into 'main'

Resolve "As a site administrator I want to be able to review submitted trail checkpoints by business owners, so that they might be added to the existing trails

Closes #82

See merge request !42

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 remote-tracking branch 'origin/main' into 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find

# Conflicts:
#	src/main/java/Team5/SmartTowns/landmarks/Landmarks.java

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

Merge branch 'main' into 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
"Commiting to merge with main"

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