Merge remote-tracking branch 'origin/main' into...

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