Merge branch '81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me' into 'main'

Resolve "As a child, I want a very flashy and modern looking webpage that will draw me in and keep me entertained while following the dragons tale trail."

Closes #81

See merge request !43

Merge remote-tracking branch 'origin/main' into 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me

# Conflicts:
#	src/main/resources/schema.sql
#	src/test/java/Team5/SmartTownsOld/DataSourceConfig.java
#	src/test/java/Team5/SmartTownsOld/DataSourceConfigahhhh.java

Location apporval form validation update

See merge request !44

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

Resolve "As a user, I want to see a page of local authorities so that I can easily source contact details for a variety of different local authorities."

Closes #74

See merge request !31

Merge remote-tracking branch 'origin/main' into 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me

# Conflicts:
#	src/main/resources/static/css/allTrails.css

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 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details

Merge branch 'businesses' 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/java/Team5/SmartTowns/Organisation/organisationControllers.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
#	src/main/resources/templates/fragments/Templating.html
#	src/main/resources/templates/local-authorities.html
#	src/test/java/Team5/SmartTownsOld/DataSourceConfig.java

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

Resolve "As a user I want to be able to use the application on any device e.g. iPhone, iPad, Laptop"

Closes #77

See merge request !36

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

Added database schema integeration with Dragon Tale landmarks to store & access neccessary data associated with all landmarks page.

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"