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