Merge remote-tracking branch 'origin/publish' into publish

Resolved conflicts:
- .github/workflows/deploy.yml: Kept our version with git push to master deployment
- app/assets/data/events.json: Kept our version of events data

Author: Dale Kunce

.github/workflows/deploy.yml

@@ -62,6 +62,13 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
+      - name: Checkout master branch
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
@@ -88,4 +95,4 @@ jobs:
           else
             git commit -m "CI deploy to gh-pages from publish@${{ github.sha }}"
             git push origin master
-          fi
+          fi