Merge branch 'main' into...

Merge branch 'main' into 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go

Merging to allow up do date branch version in order to push this banch
to main