Merge branch 'main' of https://git.infotech.monash.edu/UGIE/ugie-2026/team120/team120-app_fit3048

# Conflicts:
#	config/Migrations/schema-dump-default.lock
