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

# Conflicts:
#	.env_app_example
#	README.md
#	edrop-cron.sh
#	edrop/settings.py
#	mockoon/gbf.json
#	requirements.txt
#	track/admin.py
#	track/gbf.py
#	track/models.py
#	track/orders.py
#	track/redcap.py

Author: jdamerow

requirements.txt

@@ -4,4 +4,4 @@ psycopg2==2.9.10
 dj-static==0.0.6
 requests==2.32.3
 django-apscheduler==0.7.0
-pytz==2024.2
+pytz==2024.2