Merge branch 'master'

Conflicts:
	app/assets/stylesheets/application.css.scss.erb
	app/assets/stylesheets/bioportal.scss
	app/assets/stylesheets/browse.scss
	app/assets/stylesheets/ontologies.scss
	app/components/display/info_tooltip_component.rb
	app/components/loader_component.rb
	app/components/ontology_browse_card_component.rb
	app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml
	app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml
	app/controllers/concerns/submission_filter.rb
	app/controllers/ontologies_controller.rb
	app/helpers/ontologies_helper.rb
	app/javascript/controllers/index.js
	app/javascript/controllers/tooltip_controller.js
	app/javascript/mixins/useTooltip.js
	app/views/ontologies/browser/browse.html.haml
	config/routes.rb
	yarn.lock