Merge branch 'main' into feature-akslides

AKPlan/urls.py

AKPlanning/settings.py

requirements.txt

static_common/common/vendor/bootstrap/bootstrap-4.3.1.min.js

static_common/common/vendor/bootstrap/bootstrap-4.6.0.js

static_common/common/vendor/bootstrap/bootstrap-4.6.0.min.js

static_common/common/vendor/jquery/jquery-3.3.1.slim.min.js

static_common/common/vendor/jquery/jquery-3.5.1.js

static_common/common/vendor/jquery/jquery-3.5.1.min.js

static_common/common/vendor/jquery/jquery-3.5.1.slim.js

static_common/common/vendor/jquery/jquery-3.5.1.slim.min.js

static_common/common/vendor/popper/popper-1.14.7.min.js

templates/admin/base_site.html

templates/base.html