Merge branch 'main' into 'drag_drop_photos'

# Conflicts:
#   routes/announcement.js
#   views/add_announcement.pug
#   views/announcement_details.pug
#   views/update_announcement.pug