Merge branch 'main' into duplicate_blocks

app/assets/stylesheets/extranet/layout/_nav.sass

...controllers/admin/university/people/imports_controller.rb

app/models/communication/block.rb

app/models/communication/block/with_heading_ranks.rb

app/models/communication/extranet.rb

app/models/import.rb

app/services/importers/hash_to_cohort.rb

app/services/importers/hash_to_experience.rb

app/services/importers/hash_to_person.rb

app/services/importers/people.rb

app/views/admin/communication/blocks/_static.html.erb

...iews/admin/communication/blocks/headings/_static.html.erb

...iews/admin/university/alumni/cohorts/imports/new.html.erb

.../admin/university/people/experiences/imports/new.html.erb

app/views/admin/university/people/imports/index.html.erb

app/views/admin/university/people/imports/new.html.erb

app/views/admin/university/people/index.html.erb

config/locales/university/en.yml

config/locales/university/fr.yml

config/routes/admin/university.rb