Merge branch 'main' into connections

Gemfile

Gemfile.lock

app/assets/images/map-marker.svg

app/assets/javascripts/admin/plugins/codemirror.js

app/assets/javascripts/admin/plugins/sortable.js

app/assets/stylesheets/admin/pure.sass

app/assets/stylesheets/admin/pure/grid.sass

app/assets/stylesheets/admin/pure/variables.sass

app/assets/stylesheets/extranet/pages/_posts.sass

app/controllers/admin/application_controller.rb

app/controllers/admin/communication/blocks_controller.rb

app/controllers/admin/education/schools_controller.rb

app/controllers/admin/research/journals/papers_controller.rb

...ers/admin/research/laboratories/application_controller.rb

app/controllers/admin/research/laboratories_controller.rb

app/controllers/application_controller.rb

app/controllers/application_controller/with_features.rb

app/models/communication/extranet/document/category.rb

app/models/communication/extranet/document/kind.rb

app/models/education/school.rb