From f5fd65ac6b1a458701a454ded196e9021e874d9c Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Wed, 4 May 2022 08:25:53 +0200
Subject: [PATCH 01/95] Upgraded TinyMCE to V5

---
 app/assets/stylesheets/application.scss | 2 ++
 app/javascript/src/utils/tinymce.js.erb | 5 +++--
 package.json                            | 2 +-
 yarn.lock                               | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4e5640a461..ebc4124654 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -15,3 +15,5 @@
 
 @import "font-awesome-sprockets";
 @import "font-awesome";
+
+@import "tinymce/skins/ui/oxide/skin.css";
\ No newline at end of file
diff --git a/app/javascript/src/utils/tinymce.js.erb b/app/javascript/src/utils/tinymce.js.erb
index 6e523855b4..b1a474a7c1 100644
--- a/app/javascript/src/utils/tinymce.js.erb
+++ b/app/javascript/src/utils/tinymce.js.erb
@@ -1,7 +1,8 @@
 // Import TinyMCE
 import tinymce from 'tinymce/tinymce';
 // Import TinyMCE theme
-import 'tinymce/themes/modern/theme';
+import 'tinymce/themes/silver/theme';
+import 'tinymce/icons/default';
 // Plugins
 import 'tinymce/plugins/table';
 import 'tinymce/plugins/lists';
@@ -29,7 +30,7 @@ export const defaultOptions = {
   target_list: false,
   elementpath: false,
   resize: true,
-  autoresize_min_height: 230,
+  min_height: 230,
   autoresize_bottom_margin: 10,
   branding: false,
   extended_valid_elements: 'iframe[tooltip] , a[href|target=_blank]',
diff --git a/package.json b/package.json
index 7bc502af32..149fe44c5e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "rails-erb-loader": "^5.5.2",
     "regenerator-runtime": "^0.13.5",
     "timeago.js": "^4.0.2",
-    "tinymce": "4.9.11",
+    "tinymce": "^5.10.0",
     "turbolinks": "^5.2.0",
     "webpack": "^4.42.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 32f6980787..8570a9a235 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7479,10 +7479,10 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tinymce@4.9.11:
-  version "4.9.11"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-4.9.11.tgz#e3dae099722294c5b8d84ba7ef18dd126de6b582"
-  integrity sha512-nkSLsax+VY5DBRjMFnHFqPwTnlLEGHCco82FwJF2JNH6W+5/ClvNC1P4uhD5lXPDNiDykSHR0XJdEh7w/ICHzA==
+tinymce@^5.10.0:
+  version "5.10.4"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.4.tgz#24ee843c7648ade708605dec15d8dad07809f7db"
+  integrity sha512-L0ivAhGu7bEo6cUBrCzhtKlkIQqG2sTcL+uu7soMSxrECQIC5VwUnzp9HCEf+fRl36q6zavLV48lf8jelj+gXA==
 
 tmp@^0.2.1:
   version "0.2.1"

From e540504262fd7bdc85b9e76b76de168b148db1bb Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 9 May 2022 14:31:00 +0200
Subject: [PATCH 02/95] Updated Rails to V6 & various code fixes following
 update

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  | 173 ++++++++++--------
 .../org_admin/templates_controller.rb         |   1 +
 app/controllers/plans_controller.rb           |   2 +-
 bin/rails                                     |   1 +
 bin/rake                                      |   1 +
 bin/setup                                     |   2 +-
 config/environments/development.rb            |  19 +-
 config/environments/production.rb             |  30 ++-
 config/environments/test.rb                   |  15 +-
 config/initializers/backtrace_silencers.rb    |   2 +-
 .../initializers/filter_parameter_logging.rb  |   3 +
 .../new_framework_defaults_6_1.rb             |  67 +++++++
 config/initializers/permissions_policy.rb     |  11 ++
 config/spring.rb                              |  12 +-
 15 files changed, 249 insertions(+), 92 deletions(-)
 create mode 100644 config/initializers/new_framework_defaults_6_1.rb
 create mode 100644 config/initializers/permissions_policy.rb

diff --git a/Gemfile b/Gemfile
index d25c86bd0c..047b4682df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ ruby '>= 2.6.3'
 # ===========#
 
 # Full-stack web application framework. (http://rubyonrails.org)
-gem 'rails', '~> 5.2'
+gem 'rails', '~> 6.1'
 
 # TODO: Remove this once Rails addresses the issue with its dependency on mimemagic. Mimemagic had
 #       an MIT license but was using some incompatible GPL license code.
diff --git a/Gemfile.lock b/Gemfile.lock
index 88aba7124d..aa720acc9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,50 +1,68 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.7)
-      actionpack (= 5.2.7)
+    actioncable (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.7)
-      actionpack (= 5.2.7)
-      actionview (= 5.2.7)
-      activejob (= 5.2.7)
+    actionmailbox (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      actionview (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.7)
-      actionview (= 5.2.7)
-      activesupport (= 5.2.7)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.5.1)
+      actionview (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.7)
-      activesupport (= 5.2.7)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.5.1)
+      activesupport (= 6.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.7)
-      activesupport (= 5.2.7)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.5.1)
+      activesupport (= 6.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.7)
-      activesupport (= 5.2.7)
-    activerecord (5.2.7)
-      activemodel (= 5.2.7)
-      activesupport (= 5.2.7)
-      arel (>= 9.0)
+    activemodel (6.1.5.1)
+      activesupport (= 6.1.5.1)
+    activerecord (6.1.5.1)
+      activemodel (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
     activerecord_json_validator (2.1.0)
       activerecord (>= 4.2.0, < 8)
       json_schemer (~> 0.2.18)
-    activestorage (5.2.7)
-      actionpack (= 5.2.7)
-      activerecord (= 5.2.7)
-      marcel (~> 1.0.0)
-    activesupport (5.2.7)
+    activestorage (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.2.0)
@@ -53,9 +71,8 @@ GEM
     annotate_gem (0.0.14)
       bundler (>= 1.1)
     api-pagination (4.8.2)
-    arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.4.2.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     bcrypt (3.1.17)
     better_errors (2.9.1)
@@ -67,7 +84,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.11.1)
       msgpack (~> 1.2)
-    brakeman (5.2.1)
+    brakeman (5.2.3)
     builder (3.2.4)
     bullet (7.0.1)
       activesupport (>= 3.0.0)
@@ -136,7 +153,7 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     erubi (1.10.0)
-    excon (0.92.2)
+    excon (0.92.3)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
@@ -148,7 +165,7 @@ GEM
     faraday (2.2.0)
       faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.1)
+    faraday-net_http (2.0.2)
     ffi (1.15.5)
     flag_shih_tzu (0.3.23)
     fog-aws (3.13.0)
@@ -210,7 +227,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     json (2.6.1)
-    json_schemer (0.2.20)
+    json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -236,7 +253,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.16.0)
+    loofah (2.17.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -254,14 +271,14 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    mocha (1.13.0)
-    msgpack (1.5.0)
+    mocha (1.14.0)
+    msgpack (1.5.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    mysql2 (0.5.3)
+    mysql2 (0.5.4)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.5)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -273,9 +290,9 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
     omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
@@ -291,7 +308,7 @@ GEM
     options (2.3.2)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.3.5)
     prime (0.1.2)
@@ -303,7 +320,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     puma (5.6.4)
       nio4r (~> 2.0)
     pundit (2.2.0)
@@ -320,18 +337,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.7)
-      actioncable (= 5.2.7)
-      actionmailer (= 5.2.7)
-      actionpack (= 5.2.7)
-      actionview (= 5.2.7)
-      activejob (= 5.2.7)
-      activemodel (= 5.2.7)
-      activerecord (= 5.2.7)
-      activestorage (= 5.2.7)
-      activesupport (= 5.2.7)
-      bundler (>= 1.3.0)
-      railties (= 5.2.7)
+    rails (6.1.5.1)
+      actioncable (= 6.1.5.1)
+      actionmailbox (= 6.1.5.1)
+      actionmailer (= 6.1.5.1)
+      actionpack (= 6.1.5.1)
+      actiontext (= 6.1.5.1)
+      actionview (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activemodel (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.5.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -342,12 +361,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.7)
-      actionpack (= 5.2.7)
-      activesupport (= 5.2.7)
+    railties (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
@@ -355,7 +374,7 @@ GEM
       ffi (~> 1.0)
     recaptcha (5.9.0)
       json
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -375,7 +394,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.1)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -384,16 +403,16 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.26.1)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
@@ -406,7 +425,7 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     rubocop-thread_safety (0.4.4)
       rubocop (>= 0.53.0)
@@ -451,7 +470,6 @@ GEM
       sprockets (>= 3.0.0)
     text (1.3.1)
     thor (1.2.1)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     tomparse (0.4.2)
     translation (1.31)
@@ -459,18 +477,18 @@ GEM
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     uniform_notifier (1.16.0)
     uri_template (0.7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 5.0)
+      railties (>= 6.0.0)
     webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
@@ -488,7 +506,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.1.0)
+    wicked_pdf (2.6.2)
       activesupport
     wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
@@ -499,6 +517,7 @@ GEM
       tomparse (>= 0.4.0)
       yard
     zaru (0.3.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -554,7 +573,7 @@ DEPENDENCIES
   pundit
   pundit-matchers
   rack-mini-profiler
-  rails (~> 5.2)
+  rails (~> 6.1)
   rails-controller-testing
   recaptcha
   rollbar
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 537ea4c5e4..88f9ede0fe 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -136,6 +136,7 @@ def edit
                               'question_options.number')
                        .select('phases.title',
                                'phases.description',
+                               'phases.modifiable',
                                'sections.title',
                                'questions.text',
                                'question_options.text')
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 404a6a782f..7ddefde3fb 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -163,7 +163,7 @@ def create
   def show
     @plan = Plan.includes(
       template: { phases: { sections: { questions: :answers } } },
-      plans_guidance_groups: { guidance_group: :guidances }
+      guidance_groups: :guidances
     ).find(params[:id])
     authorize @plan
 
diff --git a/bin/rails b/bin/rails
index 0739660237..40b071ea57 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+load File.expand_path("spring", __dir__)
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 17240489f6..a5c86fcf1f 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+load File.expand_path("spring", __dir__)
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index 2b9a6e8d48..d49acbfd70 100755
--- a/bin/setup
+++ b/bin/setup
@@ -27,7 +27,7 @@ chdir APP_ROOT do
   end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! 'bin/rails db:prepare'
 
   puts "\n== Fetching mime types and adding to database =="
   system! 'bin/rails mime_types:load'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6180a5db75..451d21e7b1 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'active_support/core_ext/integer/time'
+
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -18,6 +20,7 @@
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
@@ -48,6 +51,12 @@
   # when problems arise.
   config.log_level = ENV['RAILS_LOG_LEVEL']&.to_sym || :debug
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -62,12 +71,18 @@
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Raises error for missing translations.
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 end
 
 # Used by Rails' routes url_helpers (typically when including a link in an email)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 91c4b08438..531b152317 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -78,6 +79,12 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Log disallowed deprecations.
+  config.active_support.disallowed_deprecation = :log
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
@@ -86,13 +93,34 @@
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger           = ActiveSupport::Logger.new($stdout)
+    logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end
 # Used by Rails' routes url_helpers (typically when including a link in an email)
 Rails.application.routes.default_url_options[:host] = 'example.org'
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0825f8d56a..26839f6069 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -8,6 +9,7 @@
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
+  config.action_view.cache_template_loading = true
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -46,8 +48,17 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
+  # Raises error for missing translations.
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   config.i18n.enforce_available_locales = false
 end
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 5b98aef49a..e622a8dfd4 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -7,4 +7,4 @@
 
 # You can also remove all the silencers if you're trying to debug a problem
 # that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 7a4f47b4c2..14bf0b1d21 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -3,4 +3,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
+# Rails.application.config.filter_parameters += [
+#     :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+#   ]
 Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb
new file mode 100644
index 0000000000..9526b835ab
--- /dev/null
+++ b/config/initializers/new_framework_defaults_6_1.rb
@@ -0,0 +1,67 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.1 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Support for inversing belongs_to -> has_many Active Record associations.
+# Rails.application.config.active_record.has_many_inversing = true
+
+# Track Active Storage variants in the database.
+# Rails.application.config.active_storage.track_variants = true
+
+# Apply random variation to the delay when retrying failed jobs.
+# Rails.application.config.active_job.retry_jitter = 0.15
+
+# Stop executing `after_enqueue`/`after_perform` callbacks if
+# `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
+# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
+
+# Specify cookies SameSite protection level: either :none, :lax, or :strict.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
+
+# Generate CSRF tokens that are encoded in URL-safe Base64.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_controller.urlsafe_csrf_tokens = true
+
+# Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an
+# UTC offset or a UTC time.
+# ActiveSupport.utc_to_local_returns_utc_offset_times = true
+
+# Change the default HTTP status code to `308` when redirecting non-GET/HEAD
+# requests to HTTPS in `ActionDispatch::SSL` middleware.
+# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
+
+# Use new connection handling API. For most applications this won't have any
+# effect. For applications using multiple databases, this new API provides
+# support for granular connection swapping.
+# Rails.application.config.active_record.legacy_connection_handling = false
+
+# Make `form_with` generate non-remote forms by default.
+# Rails.application.config.action_view.form_with_generates_remote_forms = false
+
+# Set the default queue name for the analysis job to the queue adapter default.
+# Rails.application.config.active_storage.queues.analysis = nil
+
+# Set the default queue name for the purge job to the queue adapter default.
+# Rails.application.config.active_storage.queues.purge = nil
+
+# Set the default queue name for the incineration job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.incineration = nil
+
+# Set the default queue name for the routing job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.routing = nil
+
+# Set the default queue name for the mail deliver job to the queue adapter default.
+# Rails.application.config.action_mailer.deliver_later_queue_name = nil
+
+# Generate a `Link` header that gives a hint to modern browsers about
+# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
+# Rails.application.config.action_view.preload_links_header = true
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 0000000000..00f64d71b0
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end
diff --git a/config/spring.rb b/config/spring.rb
index c5933e491b..37a3543421 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }
+Spring.watch(
+  ".ruby-version",
+  ".rbenv-vars",
+  "tmp/restart.txt",
+  "tmp/caching-dev.txt"
+)

From f3ddfec082b16c79aac52122e1bc0bd59c593491 Mon Sep 17 00:00:00 2001
From: Nicolas Franck <nicolas.franck@ugent.be>
Date: Wed, 11 May 2022 15:54:48 +0200
Subject: [PATCH 03/95] do not repeat help instructions for every guidance
 group

---
 app/views/org_admin/questions/_show.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/org_admin/questions/_show.html.erb b/app/views/org_admin/questions/_show.html.erb
index 80b5203134..2de1aeda85 100644
--- a/app/views/org_admin/questions/_show.html.erb
+++ b/app/views/org_admin/questions/_show.html.erb
@@ -108,14 +108,15 @@
                     ) %>
                   <% if theme_guidances.length > 0 %>
                     <% has_org_themed_guidance = true %>
-                    <p><%= _("Click the links below to view organisational guidance
-                        related to the themes associated with this question.") %></p>
-                      <% break %>
+                    <% break %>
                   <% end %>
                 <% end %>
+                <% break if has_org_themed_guidance %>
               <% end %>
 
               <% if has_org_themed_guidance %>
+                <p><%= _("Click the links below to view organisational guidance
+                        related to the themes associated with this question.") %></p>
                 <% ggs.each do |guidance_group| %>
                   <% themes_q.each do |theme| %>
                     <% theme_guidances = theme.guidances.where(

From bebc62178f126ab2cbc3b6bf7c6a330c34d65669 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 12 May 2022 11:41:52 +0100
Subject: [PATCH 04/95] Feature #3063 - Feature to be able to configure whether
 the download plans details coversheet is ticked by default.

Fix for issue #3063.

Changes:
- added a configurable property to
    # Check download of a plan coversheet tickbox
    config.x.plans.download_coversheet_tickbox_checked = false
- use property to check "project details coversheet" by default or not
if property set. If property is unset, the tickbox is unchecked.
---
 app/views/plans/_download_form.html.erb | 5 ++++-
 config/initializers/_dmproadmap.rb      | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/plans/_download_form.html.erb b/app/views/plans/_download_form.html.erb
index b9cb41799c..930d9b6a04 100644
--- a/app/views/plans/_download_form.html.erb
+++ b/app/views/plans/_download_form.html.erb
@@ -1,3 +1,6 @@
+<%
+ download_coversheet_tickbox_checked = Rails.configuration.x.plans.download_coversheet_tickbox_checked || false
+%>
 <%= form_tag(plan_export_path(@plan), method: :get, target: '_blank', id: 'download_form') do |f| %>
 
   <h2><%= _('Format') %></h2>
@@ -23,7 +26,7 @@
       <legend><%= _("Optional plan components") %></legend>
       <div class="checkbox">
         <%= label_tag 'export[project_details]' do %>
-          <%= check_box_tag 'export[project_details]', true, false %>
+          <%= check_box_tag 'export[project_details]', true, download_coversheet_tickbox_checked %>
           <%= _('project details coversheet') %>
         <% end %>
       </div>
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index a4b810a5ea..c0d18df059 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -194,6 +194,9 @@ class Application < Rails::Application
     # regardless of the plans visibility and whether or not the plan has been shared
     config.x.plans.super_admins_read_all = true
 
+    # Check download of a plan coversheet tickbox
+    config.x.plans.download_coversheet_tickbox_checked = false
+
     # ---------------------------------------------------- #
     # CACHING - all values are in seconds (86400 == 1 Day) #
     # ---------------------------------------------------- #

From 797e6642851518b42a54fe36432f1b4a9b4ccc35 Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Fri, 20 May 2022 12:13:30 -0400
Subject: [PATCH 05/95] add contributor to coversheet and add plan title to csv
 export

---
 app/controllers/plan_exports_controller.rb   |  6 ++++++
 app/models/concerns/exportable_plan.rb       | 20 ++++++++++++++++++++
 app/views/shared/export/_plan_coversheet.erb | 15 +++++++++++++++
 app/views/shared/export/_plan_txt.erb        | 14 ++++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index 46bcbef953..008ae1164a 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -43,6 +43,12 @@ def show
                              .detect { |p| p.visibility_allowed?(@plan) }
                       end
 
+     #portagenetwork/roadmap#202: add contributor to cover page
+     @hash[:data_curation] = Contributor.where(:plan_id => @plan.id).data_curation
+     @hash[:investigation] = Contributor.where(:plan_id => @plan.id).investigation
+     @hash[:pa] = Contributor.where(:plan_id => @plan.id).project_administration
+     @hash[:other] = Contributor.where(:plan_id => @plan.id).other
+
     respond_to do |format|
       format.html { show_html }
       format.csv  { show_csv }
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index b106db3a7a..f85a865e7d 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -110,6 +110,12 @@ def prepare_coversheet
     roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
+    #portagenetwork/roadmap#202: add contributor to cover page
+    hash[:data_curation] = Contributor.where(:plan_id => id).data_curation
+    hash[:investigation] = Contributor.where(:plan_id => id).investigation
+    hash[:pa] = Contributor.where(:plan_id => id).project_administration
+    hash[:other] = Contributor.where(:plan_id => id).other
+
     # Org name of plan owner's org
     hash[:affiliation] = owner.present? ? owner.org.name : ''
 
@@ -134,11 +140,25 @@ def prepare_coversheet
 
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def prepare_coversheet_for_csv(csv, _headings, hash)
+    csv << [_("Title: "), _("%{title}") % { title: title }]
     csv << if Array(hash[:attribution]).many?
              [_('Creators: '), format(_('%{authors}'), authors: Array(hash[:attribution]).join(', '))]
            else
              [_('Creator:'), format(_('%{authors}'), authors: hash[:attribution])]
            end
+           if hash[:investigation].present? 
+            csv <<  [_("Principal Investigator: "), _("%{investigation}") % { investigation: hash[:investigation].map(&:name).join(', ') }] 
+          end
+          if hash[:data_curation].present? 
+            csv << [_("Date Manager: "), _("%{data_curation}") % { data_curation: hash[:data_curation].map(&:name).join(', ') }] 
+          end
+          if hash[:pa].present? 
+            csv << [_("Project Administrator: "), _("%{pa}") % { pa: hash[:pa].map(&:name).join(', ') }] 
+          end
+          if hash[:other].present? 
+            csv << [_("Contributor: "), _("%{other}") % { other: hash[:other].map(&:name).join(', ') }] 
+          end
+          csv << [_("Affiliation: "), _("%{affiliation}") % { affiliation: hash[:affiliation] }]
     csv << ['Affiliation: ', format(_('%{affiliation}'), affiliation: hash[:affiliation])]
     csv << if hash[:funder].present?
              [_('Template: '), format(_('%{funder}'), funder: hash[:funder])]
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index 17051e6e7b..442bf1648f 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -7,6 +7,21 @@
 
   <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
+  <%# portagenetwork/roadmap#202: add contributor to cover page %>
+  <%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
+  <% if @hash[:investigation].present? %>
+  <p><b><%= _("Principal Investigator: ") %></b><%= @hash[:investigation].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:data_curation].present? %>
+  <p><b><%= _("Data Manager: ") %></b><%= @hash[:data_curation].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:pa].present? %>
+  <p><b><%= _("Project Administrator: ") %></b><%= @hash[:pa].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:other].present? %>
+  <p><b><%= _("Contributor: ") %></b><%= @hash[:other].map(&:name).join(', ') %></p><br>
+  <% end %>
+
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 
   <% if @hash[:funder].present? %>
diff --git a/app/views/shared/export/_plan_txt.erb b/app/views/shared/export/_plan_txt.erb
index ce479c16cd..7da62273a0 100644
--- a/app/views/shared/export/_plan_txt.erb
+++ b/app/views/shared/export/_plan_txt.erb
@@ -2,6 +2,20 @@
 <%= "----------------------------------------------------------\n" %>
 <% if @show_coversheet %>
 <%= Array(@hash[:attribution]).many? ? _("Creators: ") + Array(@hash[:attribution]).join(", ")  : _('Creator:') + @hash[:attribution] %>
+<%# portagenetwork/roadmap#202: add contributor to cover page %>
+<%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
+  <% if @hash[:investigation].present? %>
+<%= _("Principal Investigator: ") + @hash[:investigation].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:data_curation].present? %>
+<%= _("Data Manager: ") +  @hash[:data_curation].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:pa].present? %>
+<%= _("Project Administrator: ") + @hash[:pa].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:other].present? %>
+<%= _("Contributor: ") + @hash[:other].map(&:name).join(', ') %>
+  <% end %>
 <%= _("Affiliation: ") + @hash[:affiliation] %>
   <% if @hash[:funder].present? %>
 <%= _("Template: ") + @hash[:funder] %>

From 1ee4c7a65df8b3154ae4649f143b25d8bc306b3d Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Fri, 20 May 2022 12:36:52 -0400
Subject: [PATCH 06/95] run robocup auto correct

---
 app/controllers/plan_exports_controller.rb | 10 +++---
 app/models/concerns/exportable_plan.rb     | 40 ++++++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index 008ae1164a..e412dca8fc 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -43,11 +43,11 @@ def show
                              .detect { |p| p.visibility_allowed?(@plan) }
                       end
 
-     #portagenetwork/roadmap#202: add contributor to cover page
-     @hash[:data_curation] = Contributor.where(:plan_id => @plan.id).data_curation
-     @hash[:investigation] = Contributor.where(:plan_id => @plan.id).investigation
-     @hash[:pa] = Contributor.where(:plan_id => @plan.id).project_administration
-     @hash[:other] = Contributor.where(:plan_id => @plan.id).other
+    # portagenetwork/roadmap#202: add contributor to cover page
+    @hash[:data_curation] = Contributor.where(plan_id: @plan.id).data_curation
+    @hash[:investigation] = Contributor.where(plan_id: @plan.id).investigation
+    @hash[:pa] = Contributor.where(plan_id: @plan.id).project_administration
+    @hash[:other] = Contributor.where(plan_id: @plan.id).other
 
     respond_to do |format|
       format.html { show_html }
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index f85a865e7d..717c67ef19 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -110,11 +110,11 @@ def prepare_coversheet
     roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
-    #portagenetwork/roadmap#202: add contributor to cover page
-    hash[:data_curation] = Contributor.where(:plan_id => id).data_curation
-    hash[:investigation] = Contributor.where(:plan_id => id).investigation
-    hash[:pa] = Contributor.where(:plan_id => id).project_administration
-    hash[:other] = Contributor.where(:plan_id => id).other
+    # portagenetwork/roadmap#202: add contributor to cover page
+    hash[:data_curation] = Contributor.where(plan_id: id).data_curation
+    hash[:investigation] = Contributor.where(plan_id: id).investigation
+    hash[:pa] = Contributor.where(plan_id: id).project_administration
+    hash[:other] = Contributor.where(plan_id: id).other
 
     # Org name of plan owner's org
     hash[:affiliation] = owner.present? ? owner.org.name : ''
@@ -140,25 +140,27 @@ def prepare_coversheet
 
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def prepare_coversheet_for_csv(csv, _headings, hash)
-    csv << [_("Title: "), _("%{title}") % { title: title }]
+    csv << [_('Title: '), format(_('%{title}'), title: title)]
     csv << if Array(hash[:attribution]).many?
              [_('Creators: '), format(_('%{authors}'), authors: Array(hash[:attribution]).join(', '))]
            else
              [_('Creator:'), format(_('%{authors}'), authors: hash[:attribution])]
            end
-           if hash[:investigation].present? 
-            csv <<  [_("Principal Investigator: "), _("%{investigation}") % { investigation: hash[:investigation].map(&:name).join(', ') }] 
-          end
-          if hash[:data_curation].present? 
-            csv << [_("Date Manager: "), _("%{data_curation}") % { data_curation: hash[:data_curation].map(&:name).join(', ') }] 
-          end
-          if hash[:pa].present? 
-            csv << [_("Project Administrator: "), _("%{pa}") % { pa: hash[:pa].map(&:name).join(', ') }] 
-          end
-          if hash[:other].present? 
-            csv << [_("Contributor: "), _("%{other}") % { other: hash[:other].map(&:name).join(', ') }] 
-          end
-          csv << [_("Affiliation: "), _("%{affiliation}") % { affiliation: hash[:affiliation] }]
+    if hash[:investigation].present?
+      csv << [_('Principal Investigator: '),
+              format(_('%{investigation}'), investigation: hash[:investigation].map(&:name).join(', '))]
+    end
+    if hash[:data_curation].present?
+      csv << [_('Date Manager: '),
+              format(_('%{data_curation}'), data_curation: hash[:data_curation].map(&:name).join(', '))]
+    end
+    if hash[:pa].present?
+      csv << [_('Project Administrator: '), format(_('%{pa}'), pa: hash[:pa].map(&:name).join(', '))]
+    end
+    if hash[:other].present?
+      csv << [_('Contributor: '), format(_('%{other}'), other: hash[:other].map(&:name).join(', '))]
+    end
+    csv << [_('Affiliation: '), format(_('%{affiliation}'), affiliation: hash[:affiliation])]
     csv << ['Affiliation: ', format(_('%{affiliation}'), affiliation: hash[:affiliation])]
     csv << if hash[:funder].present?
              [_('Template: '), format(_('%{funder}'), funder: hash[:funder])]

From 9120ccb2f527543f4a3badb15a21918eae827f9c Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Fri, 20 May 2022 12:40:00 -0400
Subject: [PATCH 07/95] remove Metrics/MethodLength, Metrics/AbcSize check for
 prepare_coversheet method

---
 app/models/concerns/exportable_plan.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 717c67ef19..ff027e5045 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -97,11 +97,12 @@ def prepare(user, coversheet = false)
 
     hash
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
   # rubocop:enable Style/OptionalBooleanParameter
 
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def prepare_coversheet
     hash = {}
     # Use the name of the DMP owner/creator OR the first Co-owner if there is no

From c859b41409307cb97bcacc8aee64213342e23086 Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Fri, 20 May 2022 16:25:24 -0400
Subject: [PATCH 08/95] disable rubocop size check

---
 app/controllers/plan_exports_controller.rb   | 3 ++-
 app/models/concerns/exportable_plan.rb       | 3 ++-
 app/views/shared/export/_plan_coversheet.erb | 3 ++-
 app/views/shared/export/_plan_txt.erb        | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index e412dca8fc..1f02743f19 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -43,7 +43,8 @@ def show
                              .detect { |p| p.visibility_allowed?(@plan) }
                       end
 
-    # portagenetwork/roadmap#202: add contributor to cover page
+    # Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled
     @hash[:data_curation] = Contributor.where(plan_id: @plan.id).data_curation
     @hash[:investigation] = Contributor.where(plan_id: @plan.id).investigation
     @hash[:pa] = Contributor.where(plan_id: @plan.id).project_administration
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index ff027e5045..7c0dbee866 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -111,7 +111,8 @@ def prepare_coversheet
     roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
-    # portagenetwork/roadmap#202: add contributor to cover page
+    # Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled
     hash[:data_curation] = Contributor.where(plan_id: id).data_curation
     hash[:investigation] = Contributor.where(plan_id: id).investigation
     hash[:pa] = Contributor.where(plan_id: id).project_administration
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index 442bf1648f..8c3d465800 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -7,7 +7,8 @@
 
   <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
-  <%# portagenetwork/roadmap#202: add contributor to cover page %>
+  <%# Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled %>
   <%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
   <% if @hash[:investigation].present? %>
   <p><b><%= _("Principal Investigator: ") %></b><%= @hash[:investigation].map(&:name).join(', ') %></p><br>
diff --git a/app/views/shared/export/_plan_txt.erb b/app/views/shared/export/_plan_txt.erb
index 7da62273a0..7a9c42b87f 100644
--- a/app/views/shared/export/_plan_txt.erb
+++ b/app/views/shared/export/_plan_txt.erb
@@ -2,7 +2,8 @@
 <%= "----------------------------------------------------------\n" %>
 <% if @show_coversheet %>
 <%= Array(@hash[:attribution]).many? ? _("Creators: ") + Array(@hash[:attribution]).join(", ")  : _('Creator:') + @hash[:attribution] %>
-<%# portagenetwork/roadmap#202: add contributor to cover page %>
+<%# Added contributors to coverage of plans. 
+  # Users will see both roles and contributor names if the role is filled %>
 <%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
   <% if @hash[:investigation].present? %>
 <%= _("Principal Investigator: ") + @hash[:investigation].map(&:name).join(', ') %>

From 195e1644e69215831370a0f4957e5f7071b9db7e Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Fri, 20 May 2022 16:28:34 -0400
Subject: [PATCH 09/95] rubocop auto correct

---
 app/controllers/plan_exports_controller.rb | 2 +-
 app/models/concerns/exportable_plan.rb     | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index 1f02743f19..e442f3d60c 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -43,7 +43,7 @@ def show
                              .detect { |p| p.visibility_allowed?(@plan) }
                       end
 
-    # Added contributors to coverage of plans. 
+    # Added contributors to coverage of plans.
     # Users will see both roles and contributor names if the role is filled
     @hash[:data_curation] = Contributor.where(plan_id: @plan.id).data_curation
     @hash[:investigation] = Contributor.where(plan_id: @plan.id).investigation
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 7c0dbee866..7936eaffd3 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -100,9 +100,7 @@ def prepare(user, coversheet = false)
 
   # rubocop:enable Style/OptionalBooleanParameter
 
-  # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def prepare_coversheet
     hash = {}
     # Use the name of the DMP owner/creator OR the first Co-owner if there is no
@@ -111,7 +109,7 @@ def prepare_coversheet
     roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
-    # Added contributors to coverage of plans. 
+    # Added contributors to coverage of plans.
     # Users will see both roles and contributor names if the role is filled
     hash[:data_curation] = Contributor.where(plan_id: id).data_curation
     hash[:investigation] = Contributor.where(plan_id: id).investigation
@@ -140,7 +138,7 @@ def prepare_coversheet
   end
   # rubocop:enable Metrics/AbcSize
 
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize
   def prepare_coversheet_for_csv(csv, _headings, hash)
     csv << [_('Title: '), format(_('%{title}'), title: title)]
     csv << if Array(hash[:attribution]).many?

From e914ad8341cb9082e34353ecf0d3764c95475d7b Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Wed, 1 Jun 2022 20:18:18 +0000
Subject: [PATCH 10/95] update to seeds to prevent duplicate records

---
 Gemfile.lock | 157 +++++++++++++++++++++++++--------------------------
 db/seeds.rb  |  28 ++++-----
 2 files changed, 92 insertions(+), 93 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 88aba7124d..b07e5c7a7c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,46 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.7)
-      actionpack (= 5.2.7)
+    actioncable (5.2.8)
+      actionpack (= 5.2.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.7)
-      actionpack (= 5.2.7)
-      actionview (= 5.2.7)
-      activejob (= 5.2.7)
+    actionmailer (5.2.8)
+      actionpack (= 5.2.8)
+      actionview (= 5.2.8)
+      activejob (= 5.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.7)
-      actionview (= 5.2.7)
-      activesupport (= 5.2.7)
+    actionpack (5.2.8)
+      actionview (= 5.2.8)
+      activesupport (= 5.2.8)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.7)
-      activesupport (= 5.2.7)
+    actionview (5.2.8)
+      activesupport (= 5.2.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.7)
-      activesupport (= 5.2.7)
+    activejob (5.2.8)
+      activesupport (= 5.2.8)
       globalid (>= 0.3.6)
-    activemodel (5.2.7)
-      activesupport (= 5.2.7)
-    activerecord (5.2.7)
-      activemodel (= 5.2.7)
-      activesupport (= 5.2.7)
+    activemodel (5.2.8)
+      activesupport (= 5.2.8)
+    activerecord (5.2.8)
+      activemodel (= 5.2.8)
+      activesupport (= 5.2.8)
       arel (>= 9.0)
     activerecord_json_validator (2.1.0)
       activerecord (>= 4.2.0, < 8)
       json_schemer (~> 0.2.18)
-    activestorage (5.2.7)
-      actionpack (= 5.2.7)
-      activerecord (= 5.2.7)
+    activestorage (5.2.8)
+      actionpack (= 5.2.8)
+      activerecord (= 5.2.8)
       marcel (~> 1.0.0)
-    activesupport (5.2.7)
+    activesupport (5.2.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -52,12 +52,12 @@ GEM
       rake (>= 10.4, < 14.0)
     annotate_gem (0.0.14)
       bundler (>= 1.1)
-    api-pagination (4.8.2)
+    api-pagination (5.0.0)
     arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.4.2.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -65,20 +65,20 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.11.1)
+    bootsnap (1.12.0)
       msgpack (~> 1.2)
-    brakeman (5.2.1)
+    brakeman (5.2.3)
     builder (3.2.4)
-    bullet (7.0.1)
+    bullet (7.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
       bundler-audit
-    bundler-audit (0.9.0.1)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capybara (3.36.0)
+    capybara (3.37.1)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -136,22 +136,22 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     erubi (1.10.0)
-    excon (0.92.2)
+    excon (0.92.3)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.20.0)
+    faker (2.21.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.2.0)
+    faraday (2.3.0)
       faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.1)
+    faraday-net_http (2.0.3)
     ffi (1.15.5)
     flag_shih_tzu (0.3.23)
-    fog-aws (3.13.0)
+    fog-aws (3.14.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -173,7 +173,8 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gettext (3.4.2)
+    gettext (3.4.3)
+      erubi
       locale (>= 2.0.5)
       prime
       text (>= 1.3.0)
@@ -209,8 +210,8 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.6.1)
-    json_schemer (0.2.20)
+    json (2.6.2)
+    json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -236,7 +237,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.16.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -252,17 +253,15 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     minitest (5.15.0)
-    mocha (1.13.0)
-    msgpack (1.5.0)
+    mocha (1.14.0)
+    msgpack (1.5.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    mysql2 (0.5.3)
+    mysql2 (0.5.4)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -273,9 +272,9 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
     omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
@@ -291,7 +290,7 @@ GEM
     options (2.3.2)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.3.5)
     prime (0.1.2)
@@ -303,7 +302,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     puma (5.6.4)
       nio4r (~> 2.0)
     pundit (2.2.0)
@@ -311,7 +310,7 @@ GEM
     pundit-matchers (1.7.0)
       rspec-rails (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-protection (2.2.0)
@@ -320,18 +319,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.7)
-      actioncable (= 5.2.7)
-      actionmailer (= 5.2.7)
-      actionpack (= 5.2.7)
-      actionview (= 5.2.7)
-      activejob (= 5.2.7)
-      activemodel (= 5.2.7)
-      activerecord (= 5.2.7)
-      activestorage (= 5.2.7)
-      activesupport (= 5.2.7)
+    rails (5.2.8)
+      actioncable (= 5.2.8)
+      actionmailer (= 5.2.8)
+      actionpack (= 5.2.8)
+      actionview (= 5.2.8)
+      activejob (= 5.2.8)
+      activemodel (= 5.2.8)
+      activerecord (= 5.2.8)
+      activestorage (= 5.2.8)
+      activesupport (= 5.2.8)
       bundler (>= 1.3.0)
-      railties (= 5.2.7)
+      railties (= 5.2.8)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -342,9 +341,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.7)
-      actionpack (= 5.2.7)
-      activesupport (= 5.2.7)
+    railties (5.2.8)
+      actionpack (= 5.2.8)
+      activesupport (= 5.2.8)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -353,9 +352,9 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    recaptcha (5.9.0)
+    recaptcha (5.10.0)
       json
-    regexp_parser (2.2.1)
+    regexp_parser (2.5.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -375,7 +374,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.1)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -384,20 +383,20 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.26.1)
+    rubocop (1.30.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.14.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.14.2)
@@ -406,7 +405,7 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     rubocop-thread_safety (0.4.4)
       rubocop (>= 0.53.0)
@@ -454,8 +453,8 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.10)
     tomparse (0.4.2)
-    translation (1.31)
-      gettext (~> 3.2, >= 3.2.5, <= 3.4.2)
+    translation (1.32)
+      gettext (~> 3.2, >= 3.2.5, <= 3.4.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -488,7 +487,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.1.0)
+    wicked_pdf (2.6.3)
       activesupport
     wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
@@ -501,7 +500,7 @@ GEM
     zaru (0.3.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   activerecord_json_validator
@@ -588,7 +587,7 @@ DEPENDENCIES
   zaru
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 2.7.6p219
 
 BUNDLED WITH
-   2.2.33
+   2.3.14
diff --git a/db/seeds.rb b/db/seeds.rb
index 4f4bea73c9..e7a9fbd934 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -35,7 +35,7 @@
     identifier_prefix: "https://example.com"
   },
 ]
-identifier_schemes.each { |is| IdentifierScheme.create!(is) }
+identifier_schemes.each { |is| IdentifierScheme.find_or_create_by(is) }
 
 # Question Formats
 # -------------------------------------------------------
@@ -83,7 +83,7 @@
     formattype: 6
   }
 ]
-question_formats.each{ |qf| QuestionFormat.create!(qf) }
+question_formats.each{ |qf| QuestionFormat.find_or_create_by(qf) }
 
 # Languages (check config/locales for any ones not defined here)
 # -------------------------------------------------------
@@ -117,7 +117,7 @@
    name: 'Türk',
    default_language: false}
 ]
-languages.each { |l| Language.create!(l) }
+languages.each { |l| Language.find_or_create_by(l) }
 default_language = Language.find_by(abbreviation: default_locale)
 
 # # Scan through the locale files and add an entry if a file is present but
@@ -197,7 +197,7 @@
   {name: 'review_org_plans'}
 ]
 
-perms.each{ |p| Perm.create!(p) }
+perms.each{ |p| Perm.find_or_create_by(p) }
 
 # Guidance Themes
 # -------------------------------------------------------
@@ -217,7 +217,7 @@
   {title: 'Budget'},
   {title: 'Related Policies'}
 ]
-themes.each { |t| Theme.create!(t.merge(locale: default_locale)) }
+themes.each { |t| Theme.find_or_create_by(t.merge(locale: default_locale)) }
 
 # Token Permission Types
 # -------------------------------------------------------
@@ -227,7 +227,7 @@
   {token_type: 'templates', text_description: 'allows a user access to the templates api endpoint'},
   {token_type: 'statistics', text_description: 'allows a user access to the statistics api endpoint'}
 ]
-token_permission_types.each{ |tpt| TokenPermissionType.create!(tpt) }
+token_permission_types.each{ |tpt| TokenPermissionType.find_or_create_by(tpt) }
 
 # Create our generic organisation, a funder and a University
 # -------------------------------------------------------
@@ -250,7 +250,7 @@
    language: default_language, region: region,
    is_other: false, managed: true}
 ]
-orgs.each { |o| Org.create!(o) }
+orgs.each { |o| Org.create!(o) unless Org.find_by(name: o[:name]).present? }
 
 # Create a Super Admin associated with our generic organisation,
 # an Org Admin for our funder and an Org Admin and User for our University
@@ -299,7 +299,7 @@
    accept_terms: true,
    confirmed_at: Time.zone.now}
 ]
-users.each{ |u| User.create(u) }
+users.each{ |u| User.create!(u) unless User.find_by(email: u[:email]) }
 
 # Create a Guidance Group for our organisation and the funder
 # -------------------------------------------------------
@@ -419,7 +419,7 @@
    published: true,
    themes: [Theme.find_by(title: 'Data Description')]}
 ]
-guidances.each{ |g| Guidance.create!(g) }
+guidances.each{ |g| Guidance.create!(g) unless Guidance.find_by(guidance_group: g[:guidance_group], text: g[:text]) }
 
 # Create a default template for the curation centre and one for the example funder
 # -------------------------------------------------------
@@ -451,7 +451,7 @@
 ]
 # Template creation calls defaults handler which sets is_default and
 # published to false automatically, so update them after creation
-templates.each { |atts| Template.create!(atts) }
+templates.each { |atts| Template.find_or_create_by(atts) }
 
 # Create 2 phases for the funder's template and one for our generic template
 # -------------------------------------------------------
@@ -475,7 +475,7 @@
    modifiable: false,
    template: Template.find_by(title: "Department of Testing Award")}
 ]
-phases.each{ |p| Phase.create!(p) }
+phases.each{ |p| Phase.find_or_create_by(p) }
 
 generic_template_phase_1 = Phase.find_by(title: "Generic Data Management Planning Template")
 funder_template_phase_1  = Phase.find_by(title: "Preliminary Statement of Work")
@@ -556,7 +556,7 @@
     phase: funder_template_phase_2
   }
 ]
-sections.each{ |s| Section.create!(s) }
+sections.each{ |s| Section.find_or_create_by(s) }
 
 text_area = QuestionFormat.find_by(title: "Text area")
 
@@ -712,7 +712,7 @@
    modifiable: false,
    themes: [Theme.find_by(title: "Preservation"), Theme.find_by(title: "Data Sharing")]}
 ]
-questions.each{ |q| Question.create!(q) }
+questions.each{ |q| Question.create!(q) unless Question.find_by(section: q[:section], text: q[:text]) }
 
 radio_button = Question.new(
     text: "Please select the appropriate formats.",
@@ -827,4 +827,4 @@
    org: Org.find_by(abbreviation: 'GA'),
    question: Question.find_by(text: "What types of data will you collect and how will it be stored?")},
 ]
-annotations.each{ |s| Annotation.create!(s) if Annotation.find_by(text: s[:text]).nil? }
+annotations.each{ |s| Annotation.find_or_create_by(s) if Annotation.find_by(text: s[:text]).nil? }

From 0fc01e00b46988676fd4bd4b78c6d39b78491530 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Wed, 1 Jun 2022 21:25:56 +0000
Subject: [PATCH 11/95] added logic to allow us to configure the hostname via
 an environment variable due to Rails new middleware that prevents DNS
 rebinding by introducing a host whitelist

---
 .gitignore                         |  3 +++
 config/environments/development.rb | 10 +++++++++-
 config/environments/production.rb  | 10 +++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index af0d767c65..4cdd5fee27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,6 @@ yarn-debug.log*
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+
+# Ignore briley AWS cloud9 script to start the application
+cloud9-start.sh
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 451d21e7b1..1264845269 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -83,7 +83,15 @@
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
+
+  # Rails 6+ adds middleware to prevent DNS rebinding attacks:
+  #    https://guides.rubyonrails.org/configuring.html#actiondispatch-hostauthorization
+  #
+  # This allows us to define the hostname and add it to the whitelist. If you attempt
+  # to access the site and receive a 'Blocked host' error then you will need to
+  # set this environment variable
+  config.hosts << ENV['DMPROADMAP_HOST'] if ENV['DMPROADMAP_HOST'].present?
 end
 
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = 'localhost:3000'
+Rails.application.routes.default_url_options[:host] = ENV['DMPROADMAP_HOST'] || 'localhost:3000'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 531b152317..89edc9b45f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -121,6 +121,14 @@
   # config.active_record.database_selector = { delay: 2.seconds }
   # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
   # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+
+  # Rails 6+ adds middleware to prevent DNS rebinding attacks:
+  #    https://guides.rubyonrails.org/configuring.html#actiondispatch-hostauthorization
+  #
+  # This allows us to define the hostname and add it to the whitelist. If you attempt
+  # to access the site and receive a 'Blocked host' error then you will need to
+  # set this environment variable
+  config.hosts << ENV['DMPROADMAP_HOST'] if ENV['DMPROADMAP_HOST'].present?
 end
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = 'example.org'
+Rails.application.routes.default_url_options[:host] = ENV['DMPROADMAP_HOST'] || 'example.org'

From 262dd58da4b28374f473e5df6c78714bdc75fabd Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Thu, 2 Jun 2022 17:51:28 +0000
Subject: [PATCH 12/95] Updated config to use Rails 6.1 defaults. Configured
 eager load paths for zeitwerk. Fixed some issues with the ContactUs
 controller because its constant name did not conform to Rails standards.
 removed Faker:Language helper because it did not conform to naming
 conventions and updated tests. Started trying to fix rspec tests

---
 .../{ => contact_us}/contacts_controller.rb   |  0
 app/models/concerns/json_link_validator.rb    |  2 +-
 .../answer_for_correct_template_validator.rb  |  2 +-
 app/validators/email_validator.rb             |  2 +-
 app/validators/org_links_validator.rb         |  7 ++--
 app/validators/template_links_validator.rb    | 13 ++++---
 app/validators/url_validator.rb               |  2 +-
 config/application.rb                         |  9 +++--
 config/environments/test.rb                   |  2 +-
 lib/faker/language.rb                         | 36 -------------------
 .../data_cleanup_rule_generator.rb            |  2 +-
 .../{ => data_cleanup/rules}/base.rb          |  0
 .../{ => data_cleanup/rules}/rule.rb.erb      |  1 +
 spec/factories/languages.rb                   |  3 +-
 spec/factories/templates.rb                   |  1 +
 spec/features/registrations_spec.rb           |  2 +-
 spec/models/language_spec.rb                  |  8 ++---
 spec/models/org_spec.rb                       |  2 +-
 spec/models/user_spec.rb                      |  2 +-
 .../super_admin/orgs/merge_presenter_spec.rb  |  2 +-
 spec/requests/api/v1/plans_controller.rb      |  2 +-
 .../v1/deserialization/contributor_spec.rb    |  2 +-
 .../api/v1/deserialization/funding_spec.rb    |  2 +-
 .../api/v1/deserialization/org_spec.rb        |  4 +--
 .../api/v1/deserialization/plan_spec.rb       |  2 +-
 spec/services/locale_service_spec.rb          |  4 +--
 .../org_selection/hash_to_org_service_spec.rb |  2 +-
 27 files changed, 45 insertions(+), 71 deletions(-)
 rename app/controllers/{ => contact_us}/contacts_controller.rb (100%)
 delete mode 100644 lib/faker/language.rb
 rename lib/generators/data_cleanup_rule/templates/{ => data_cleanup/rules}/base.rb (100%)
 rename lib/generators/data_cleanup_rule/templates/{ => data_cleanup/rules}/rule.rb.erb (99%)

diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contact_us/contacts_controller.rb
similarity index 100%
rename from app/controllers/contacts_controller.rb
rename to app/controllers/contact_us/contacts_controller.rb
diff --git a/app/models/concerns/json_link_validator.rb b/app/models/concerns/json_link_validator.rb
index 2e0e037e33..544f0e22ff 100644
--- a/app/models/concerns/json_link_validator.rb
+++ b/app/models/concerns/json_link_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Module that helps validate Template and Org links
-module JSONLinkValidator
+module JsonLinkValidator
   # Validates whether or not the value passed is conforming to
   # [{ link: String, text: String}, ...]
   def valid_links?(value)
diff --git a/app/validators/answer_for_correct_template_validator.rb b/app/validators/answer_for_correct_template_validator.rb
index 20723a8eb5..b76cc31a56 100644
--- a/app/validators/answer_for_correct_template_validator.rb
+++ b/app/validators/answer_for_correct_template_validator.rb
@@ -7,6 +7,6 @@ def validate(record)
     # Make sure that the question and plan belong to the same template!
     return unless record.plan.template == record.question.section.phase.template
 
-    record.errors[:question] << I18n.t('helpers.answer.question_must_belong_to_correct_template')
+    record.errors.add(:question, I18n.t('helpers.answer.question_must_belong_to_correct_template'))
   end
 end
diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb
index 05e46d9efb..6a3709a13b 100644
--- a/app/validators/email_validator.rb
+++ b/app/validators/email_validator.rb
@@ -5,6 +5,6 @@ class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
 
-    record.errors[attribute] << (options[:message] || 'is not a valid email address')
+    record.errors.add(attribute, options.fetch(:message, 'is not a valid email address'))
   end
 end
diff --git a/app/validators/org_links_validator.rb b/app/validators/org_links_validator.rb
index 1f720e6458..29c3a32fcf 100644
--- a/app/validators/org_links_validator.rb
+++ b/app/validators/org_links_validator.rb
@@ -2,15 +2,16 @@
 
 # Validation for the format of the JSON for Org links
 class OrgLinksValidator < ActiveModel::Validator
-  include JSONLinkValidator
+  include JsonLinkValidator
+
   def validate(record)
     links = record.links
     if links.is_a?(Hash)
       unless links.with_indifferent_access.key?('org')
-        record.errors[:links] << (format(_('A key "org" is expected for links hash'), key: k))
+        record.errors.add(:links, format(_('A key "org" is expected for links hash'), key: k))
       end
     else
-      record.errors[:links] << _('A hash is expected for links')
+      record.errors.add(:links, _('A hash is expected for links'))
     end
   end
 end
diff --git a/app/validators/template_links_validator.rb b/app/validators/template_links_validator.rb
index 5127a92e17..7c4f09ed56 100644
--- a/app/validators/template_links_validator.rb
+++ b/app/validators/template_links_validator.rb
@@ -2,25 +2,30 @@
 
 # Validation for the format of the JSON for Template links
 class TemplateLinksValidator < ActiveModel::Validator
-  include JSONLinkValidator
+  include JsonLinkValidator
 
   # rubocop:disable Metrics/AbcSize
   def validate(record)
     links = record.links
     expected_keys = %w[funder sample_plan]
+
+  p record.class.name
+  p record.inspect
+  p "VALIDATOR: #{links.class.name}, #{links.is_a?(Hash)}"
+
     if links.is_a?(Hash)
       expected_keys.each do |k|
         if links.key?(k)
           unless valid_links?(links[k])
             msg = _('The key %{key} does not have a valid set of object links')
-            record.errors[:links] << (format(msg, key: k))
+            record.errors.add(:links, format(msg, key: k))
           end
         else
-          record.errors[:links] << (format(_('A key %{key} is expected for links hash'), key: k))
+          record.errors.add(:links, format(_('A key %{key} is expected for links hash'), key: k))
         end
       end
     else
-      record.errors[:links] << _('A hash is expected for links')
+      record.errors.add(:links, _('A hash is expected for links'))
     end
   end
   # rubocop:enable Metrics/AbcSize
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index cdaed9416f..3f344b6ce7 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -6,6 +6,6 @@ def validate_each(record, attribute, value)
     reg = %r{https?://[-a-zA-Z0-9@:%_+.~#?&/=]{2,256}\.[a-z]{2,4}\b(/[-a-zA-Z0-9@:%_+.~#?&/=]*)?}
     return unless value =~ reg
 
-    record.errors[attribute] << (options[:message] || 'is not a valid URL')
+    record.errors.add(attribute, options.fetch(:message, 'is not a valid URL'))
   end
 end
diff --git a/config/application.rb b/config/application.rb
index d1d65c2638..2074f1f43d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,7 +14,7 @@ module DMPRoadmap
   # DMPRoadmap application
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -24,8 +24,11 @@ class Application < Rails::Application
     # --------------------------------- #
     # OVERRIDES TO DEFAULT RAILS CONFIG #
     # --------------------------------- #
-
-    config.autoload_paths += %W[#{config.root}/lib]
+    # Ensure that Zeitwerk knows to load our classes in the lib directory
+    config.eager_load_paths << config.root.join('lib')
+    # Have Zeitwerk skip generators because the generator templates are
+    # incompatible with the Rails module/class naming conventions
+    Rails.autoloaders.main.ignore(config.root.join('lib/generators'))
 
     # HTML tags that are allowed to pass through `sanitize`.
     config.action_view.sanitized_allowed_tags = %w[
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 26839f6069..8b66766d88 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,7 +8,7 @@
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
   config.action_view.cache_template_loading = true
 
   # Do not eager load code on boot. This avoids loading your whole application
diff --git a/lib/faker/language.rb b/lib/faker/language.rb
deleted file mode 100644
index 04d7171c40..0000000000
--- a/lib/faker/language.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Faker
-  # Monkey patch for Faker to add support for our locales
-  class Language < Base
-    class << self
-      def name
-        sample(translate('faker.language.names'))
-      end
-
-      def names(num = 3)
-        resolved_num = resolve(num)
-        suffle(translate('faker.language.names'))[0..resolved_num]
-      end
-
-      def abbreviation
-        sample(translate('faker.language.abbreviations'))
-      end
-
-      def abbreviations(num = 3)
-        resolved_num = resolve(num)
-        suffle(translate('faker.language.abbreviations'))[0..resolved_num]
-      end
-
-      private
-
-      def resolve(value)
-        case value
-        when Array then sample(value)
-        when Range then rand value
-        else value
-        end
-      end
-    end
-  end
-end
diff --git a/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb b/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
index ba3957c7df..b1eb6ab89d 100644
--- a/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
+++ b/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
@@ -2,7 +2,7 @@
 
 # Generator class for creating a new Rule to clean DB records.
 class DataCleanupRuleGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path('templates', __dir__)
+  source_root File.expand_path('templates/data_cleanup/rules', __dir__)
 
   # Copy the Rule template and create a new Rule file
   def add_rule_file
diff --git a/lib/generators/data_cleanup_rule/templates/base.rb b/lib/generators/data_cleanup_rule/templates/data_cleanup/rules/base.rb
similarity index 100%
rename from lib/generators/data_cleanup_rule/templates/base.rb
rename to lib/generators/data_cleanup_rule/templates/data_cleanup/rules/base.rb
diff --git a/lib/generators/data_cleanup_rule/templates/rule.rb.erb b/lib/generators/data_cleanup_rule/templates/data_cleanup/rules/rule.rb.erb
similarity index 99%
rename from lib/generators/data_cleanup_rule/templates/rule.rb.erb
rename to lib/generators/data_cleanup_rule/templates/data_cleanup/rules/rule.rb.erb
index bad37d1b42..e61b44f30e 100644
--- a/lib/generators/data_cleanup_rule/templates/rule.rb.erb
+++ b/lib/generators/data_cleanup_rule/templates/data_cleanup/rules/rule.rb.erb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DataCleanup
   module Rules
     # <%= default_description %>
diff --git a/spec/factories/languages.rb b/spec/factories/languages.rb
index 2a31e6654c..ed8496b0e5 100644
--- a/spec/factories/languages.rb
+++ b/spec/factories/languages.rb
@@ -13,9 +13,8 @@
 
 FactoryBot.define do
   factory :language do
-    name { Faker::Language.unique.name }
+    name { Faker::Movies::StarWars.unique.specie }
     description { "Language for #{name}" }
-    abbreviation { Faker::Language.unique.abbreviation }
     default_language { false }
     trait :with_dialect do
       abbreviation do
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index 3b38a95f93..918b1b999b 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -42,6 +42,7 @@
     published { false }
     archived { false }
     sequence(:version)
+    # links { { funder: [], sample_plan: [] } }
 
     trait :publicly_visible do
       after(:create) do |template|
diff --git a/spec/features/registrations_spec.rb b/spec/features/registrations_spec.rb
index 6f9b5fdfd9..c806a0d565 100644
--- a/spec/features/registrations_spec.rb
+++ b/spec/features/registrations_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'Registrations', type: :feature do
   let!(:org) { create(:org) }
-  let!(:language) { Language.default || create(:language, default_language: true) }
+  let!(:language) { Language.default || create(:language, abbreviation: 'reg-feat', default_language: true) }
 
   let(:user_attributes) { attributes_for(:user) }
 
diff --git a/spec/models/language_spec.rb b/spec/models/language_spec.rb
index c46a5e0cd4..7735f210b3 100644
--- a/spec/models/language_spec.rb
+++ b/spec/models/language_spec.rb
@@ -9,7 +9,7 @@
   end
 
   context 'validations' do
-    subject { build(:language) }
+    subject { build(:language, abbreviation: 'foo') }
 
     it { is_expected.to validate_presence_of(:name) }
 
@@ -18,7 +18,7 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it 'is expected to validate uniquenss of abbreviation' do
-      @language = build(:language, abbreviation: create(:language).abbreviation)
+      @language = build(:language, abbreviation: create(:language, abbreviation: 'bar').abbreviation)
       expect(@language).not_to be_valid
       expect(@language).to have(1).errors_on(:abbreviation)
     end
@@ -55,13 +55,13 @@
     subject { Language.default }
 
     context 'when langauge is default_language' do
-      let!(:language) { create(:language, default_language: true) }
+      let!(:language) { create(:language, abbreviation: 'foo', default_language: true) }
 
       it { is_expected.to eql(language) }
     end
 
     context 'when language is not default_language' do
-      let!(:language) { create(:language, default_language: false) }
+      let!(:language) { create(:language, abbreviation: 'foo', default_language: false) }
 
       it { is_expected.not_to eql(language) }
     end
diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 1310c8afe1..187bfbeca6 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -565,7 +565,7 @@
                                               feedback_enabled: true,
                                               is_other: true,
                                               region: create(:region),
-                                              language: create(:language))
+                                              language: create(:language, abbreviation: 'org-mdl'))
       end
 
       it 'returns false unless Org is an Org' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7645560348..63ffc73a06 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -155,7 +155,7 @@
     subject { user.locale }
 
     context 'when user language present' do
-      let(:language) { create(:language) }
+      let(:language) { create(:language, abbreviation: 'usr-mdl') }
 
       before do
         user.update(language: language)
diff --git a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
index 2e643acae9..6039716e6b 100644
--- a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
+++ b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
@@ -19,7 +19,7 @@
                                       contact_email: Faker::Internet.email,
                                       links: { org: { foo: 'bar' } },
                                       region: create(:region, name: Faker::Music::PearlJam.song),
-                                      language: create(:language),
+                                      language: create(:language, abbreviation: 'merge-org'),
                                       token_permission_types: [@tpt])
     create(:annotation, org: @from_org)
     create(:department, org: @from_org)
diff --git a/spec/requests/api/v1/plans_controller.rb b/spec/requests/api/v1/plans_controller.rb
index 43ff5cfbc8..1d44946068 100644
--- a/spec/requests/api/v1/plans_controller.rb
+++ b/spec/requests/api/v1/plans_controller.rb
@@ -10,7 +10,7 @@
       mock_authorization_for_api_client
 
       # Org model requires a language so make sure the default is set
-      create(:language, default_language: true) unless Language.default.present?
+      create(:language, abbreviation: 'v1-plans', default_language: true) unless Language.default.present?
     end
 
     describe 'GET /api/v1/plan/:id - show' do
diff --git a/spec/services/api/v1/deserialization/contributor_spec.rb b/spec/services/api/v1/deserialization/contributor_spec.rb
index 0d07e96ded..99c9cbf941 100644
--- a/spec/services/api/v1/deserialization/contributor_spec.rb
+++ b/spec/services/api/v1/deserialization/contributor_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe Api::V1::Deserialization::Contributor do
   before(:each) do
     # Org requires a language, so make sure a default is available!
-    create(:language, default_language: true) unless Language.default
+    create(:language, abbreviation: 'v1-contrib', default_language: true) unless Language.default
     @org = create(:org)
     @plan = build(:plan, template: create(:template), org: @org)
 
diff --git a/spec/services/api/v1/deserialization/funding_spec.rb b/spec/services/api/v1/deserialization/funding_spec.rb
index 88d7c000b7..84bd800d61 100644
--- a/spec/services/api/v1/deserialization/funding_spec.rb
+++ b/spec/services/api/v1/deserialization/funding_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe Api::V1::Deserialization::Funding do
   before(:each) do
     # Org requires a language, so make sure a default is available!
-    create(:language, default_language: true) unless Language.default
+    create(:language, abbreviation: 'v1-fund', default_language: true) unless Language.default
 
     @funder = create(:org, :funder, name: Faker::Company.name)
     @plan = create(:plan)
diff --git a/spec/services/api/v1/deserialization/org_spec.rb b/spec/services/api/v1/deserialization/org_spec.rb
index a6135a6865..402a17df80 100644
--- a/spec/services/api/v1/deserialization/org_spec.rb
+++ b/spec/services/api/v1/deserialization/org_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe Api::V1::Deserialization::Org do
   before(:each) do
     # Org requires a language, so make sure a default is available!
-    create(:language, default_language: true) unless Language.default
+    create(:language, abbreviation: 'v1-org', default_language: true) unless Language.default
 
     @name = Faker::Company.unique.name
     @abbrev = Faker::Lorem.word.upcase
@@ -37,7 +37,7 @@
       expect(result).to eql(@org)
     end
     it 'sets the language to the default' do
-      default = Language.default || create(:language)
+      default = Language.default || create(:language, abbreviation: 'v1-org-dflt')
       result = described_class.deserialize(json: @json)
       expect(result.language).to eql(default)
     end
diff --git a/spec/services/api/v1/deserialization/plan_spec.rb b/spec/services/api/v1/deserialization/plan_spec.rb
index f8937952d1..b99b265062 100644
--- a/spec/services/api/v1/deserialization/plan_spec.rb
+++ b/spec/services/api/v1/deserialization/plan_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe Api::V1::Deserialization::Plan do
   before(:each) do
     # Org requires a language, so make sure a default is available!
-    create(:language, default_language: true) unless Language.default
+    create(:language, abbreviation: 'v1-plan', default_language: true) unless Language.default
 
     @template = create(:template)
     @plan = create(:plan, template: @template)
diff --git a/spec/services/locale_service_spec.rb b/spec/services/locale_service_spec.rb
index 7c0eb2fb1c..d956c693d5 100644
--- a/spec/services/locale_service_spec.rb
+++ b/spec/services/locale_service_spec.rb
@@ -5,7 +5,7 @@
 RSpec.describe LocaleService do
   before(:each) do
     Language.destroy_all
-    @default = Language.default || create(:language, default_language: true)
+    @default = Language.default || create(:language, abbreviation: 'loc-svc', default_language: true)
     Rails.configuration.x.locales.default = @default.abbreviation
     Rails.configuration.x.locales.gettext_join_character = '_'
     Rails.configuration.x.locales.i18n_join_character = '-'
@@ -25,7 +25,7 @@
 
   describe '#available_locales' do
     it 'returns the abbreviations of all Languages in the database' do
-      create(:language)
+      create(:language, abbreviation: 'avail-loc')
       expected = Language.all.order(:abbreviation).pluck(:abbreviation)
       expect(described_class.available_locales).to eql(expected)
     end
diff --git a/spec/services/org_selection/hash_to_org_service_spec.rb b/spec/services/org_selection/hash_to_org_service_spec.rb
index 63d425710c..62e3794503 100644
--- a/spec/services/org_selection/hash_to_org_service_spec.rb
+++ b/spec/services/org_selection/hash_to_org_service_spec.rb
@@ -148,7 +148,7 @@
 
     describe '#language_from_hash(hash:)' do
       before(:each) do
-        @dflt = Language.default || create(:language, default_language: true)
+        @dflt = Language.default || create(:language, abbreviation: 'org-sel', default_language: true)
       end
 
       it 'returns the default language if hash is empty' do

From 6a3bb7f90119c65be0237507ccc78e80247a4fca Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Thu, 2 Jun 2022 19:08:28 +0000
Subject: [PATCH 13/95] switched all occurrences of 'update_attributes' to
 'update' since that method is deprecated

---
 app/controllers/guidances_controller.rb          | 6 +++---
 app/controllers/org_admin/users_controller.rb    | 2 +-
 app/controllers/registrations_controller.rb      | 2 +-
 app/controllers/roles_controller.rb              | 2 +-
 app/controllers/super_admin/themes_controller.rb | 2 +-
 app/controllers/super_admin/users_controller.rb  | 2 +-
 app/validators/template_links_validator.rb       | 6 +++---
 lib/tasks/migrate.rake                           | 5 ++---
 lib/tasks/upgrade.rake                           | 2 +-
 spec/controllers/guidances_controller_spec.rb    | 4 ++--
 10 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb
index d3a193a12e..ac0f1dc33b 100644
--- a/app/controllers/guidances_controller.rb
+++ b/app/controllers/guidances_controller.rb
@@ -63,7 +63,7 @@ def admin_update
     @guidance = Guidance.find(params[:id])
     authorize @guidance
 
-    if @guidance.update_attributes(guidance_params)
+    if @guidance.update(guidance_params)
       if @guidance.published?
         guidance_group = GuidanceGroup.find(@guidance.guidance_group_id)
         if !guidance_group.published? || guidance_group.published.nil?
@@ -103,7 +103,7 @@ def admin_destroy
   def admin_publish
     @guidance = Guidance.find(params[:id])
     authorize @guidance
-    if @guidance.update_attributes(published: true)
+    if @guidance.update(published: true)
       guidance_group = GuidanceGroup.find(@guidance.guidance_group_id)
       guidance_group.update(published: true) if !guidance_group.published? || guidance_group.published.nil?
       flash[:notice] = _('Your guidance has been published and is now available to users.')
@@ -120,7 +120,7 @@ def admin_publish
   def admin_unpublish
     @guidance = Guidance.find(params[:id])
     authorize @guidance
-    if @guidance.update_attributes(published: false)
+    if @guidance.update(published: false)
       guidance_group = GuidanceGroup.find(@guidance.guidance_group_id)
       guidance_group.update(published: false) unless guidance_group.guidances.where(published: true).exists?
       flash[:notice] = _('Your guidance is no longer published and will not be available to users.')
diff --git a/app/controllers/org_admin/users_controller.rb b/app/controllers/org_admin/users_controller.rb
index 6138ddb18b..9474a9ffd7 100644
--- a/app/controllers/org_admin/users_controller.rb
+++ b/app/controllers/org_admin/users_controller.rb
@@ -26,7 +26,7 @@ def update
       authorize @user
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
-      if @user.update_attributes(user_params)
+      if @user.update(user_params)
         flash.now[:notice] = success_message(@user, _('updated'))
       else
         flash.now[:alert] = failure_message(@user, _('update'))
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index a3fbb757d5..16967c3c33 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -234,7 +234,7 @@ def do_update(require_password = true, confirm = false)
     end
 
     # unlink shibboleth from user's details
-    current_user.update_attributes(shibboleth_id: '') if params[:unlink_flag] == 'true'
+    current_user.update(shibboleth_id: '') if params[:unlink_flag] == 'true'
 
     # render the correct page
     if successfully_updated
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index bf0fe082df..b40c559f61 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -81,7 +81,7 @@ def update
     @role = Role.find(params[:id])
     authorize @role
 
-    if @role.update_attributes(access: role_params[:access])
+    if @role.update(access: role_params[:access])
       deliver_if(recipients: @role.user, key: 'users.added_as_coowner') do |_r|
         UserMailer.permissions_change_notification(@role, current_user).deliver_now
       end
diff --git a/app/controllers/super_admin/themes_controller.rb b/app/controllers/super_admin/themes_controller.rb
index 6be6852c59..ccd80dbfb8 100644
--- a/app/controllers/super_admin/themes_controller.rb
+++ b/app/controllers/super_admin/themes_controller.rb
@@ -35,7 +35,7 @@ def edit
     def update
       authorize(Theme)
       @theme = Theme.find(params[:id])
-      if @theme.update_attributes(permitted_params)
+      if @theme.update(permitted_params)
         flash.now[:notice] = success_message(@theme, _('updated'))
       else
         flash.now[:alert] = failure_message(@theme, _('update'))
diff --git a/app/controllers/super_admin/users_controller.rb b/app/controllers/super_admin/users_controller.rb
index 4c67446d60..a27f528adb 100644
--- a/app/controllers/super_admin/users_controller.rb
+++ b/app/controllers/super_admin/users_controller.rb
@@ -39,7 +39,7 @@ def update
       # Remove the extraneous Org Selector hidden fields
       attrs = remove_org_selection_params(params_in: attrs)
 
-      if @user.update_attributes(attrs)
+      if @user.update(attrs)
         # If its a new Org create it
         if lookup.present? && lookup.new_record?
           lookup.save
diff --git a/app/validators/template_links_validator.rb b/app/validators/template_links_validator.rb
index 7c4f09ed56..cf8d4ce25e 100644
--- a/app/validators/template_links_validator.rb
+++ b/app/validators/template_links_validator.rb
@@ -9,9 +9,9 @@ def validate(record)
     links = record.links
     expected_keys = %w[funder sample_plan]
 
-  p record.class.name
-  p record.inspect
-  p "VALIDATOR: #{links.class.name}, #{links.is_a?(Hash)}"
+p record.class.name
+p record.inspect
+p "VALIDATOR: #{links.class.name}, #{links.is_a?(Hash)}"
 
     if links.is_a?(Hash)
       expected_keys.each do |k|
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 0820c3fe74..5bc08a9af3 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -258,7 +258,7 @@ namespace :migrate do
   desc 'Initialize plans.visibility to the default specified in application.rb'
   task init_plan_visibility: :environment do
     default = Rails.configuration.x.plans.default_visibility.to_sym
-    Plan.all.each { |p| p.update_attributes(visibility: default) unless p.visibility == default }
+    Plan.all.each { |p| p.update(visibility: default) unless p.visibility == default }
   end
 
   desc 'Move old plans.data_contact to data_contact_email and data_contact_phone'
@@ -278,8 +278,7 @@ namespace :migrate do
       contact = contact[0..(contact.length - 2)] if contact.ends_with?(',')
       contact = nil if contact == ','
 
-      p.update_attributes(data_contact_email: email, data_contact_phone: phone,
-                          data_contact: contact)
+      p.update(data_contact_email: email, data_contact_phone: phone, data_contact: contact)
     end
   end
 
diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake
index 4eb4b85149..1b004a2120 100644
--- a/lib/tasks/upgrade.rake
+++ b/lib/tasks/upgrade.rake
@@ -466,7 +466,7 @@ namespace :upgrade do
       puts 'Searching for Orgs with an undefined contact_email ...'
       Org.where("contact_email IS NULL OR contact_email = ''").each do |org|
         puts "  Setting contact_email to #{email} for #{org.name}"
-        org.update_attributes(contact_email: email, contact_name: name)
+        org.update(contact_email: email, contact_name: name)
       end
     else
       puts 'No helpdesk_email and/or name found in your config/initializers/dmproadmap.rb. Please add them!'
diff --git a/spec/controllers/guidances_controller_spec.rb b/spec/controllers/guidances_controller_spec.rb
index 0c6c082736..69fce9cb9e 100644
--- a/spec/controllers/guidances_controller_spec.rb
+++ b/spec/controllers/guidances_controller_spec.rb
@@ -109,7 +109,7 @@
       expect(@guidance.reload.published?).to eql(true)
     end
     it 'fails' do
-      Guidance.any_instance.stubs(:update_attributes).returns(false)
+      Guidance.any_instance.stubs(:update).returns(false)
       args = { published: false }
       put :admin_publish, params: { id: @guidance.id, guidance: args }
       expect(response).to redirect_to(admin_index_guidance_path)
@@ -137,7 +137,7 @@
       expect(@guidance.reload.published?).to eql(false)
     end
     it 'fails' do
-      Guidance.any_instance.stubs(:update_attributes).returns(false)
+      Guidance.any_instance.stubs(:update).returns(false)
       args = { published: true }
       put :admin_unpublish, params: { id: @guidance.id, guidance: args }
       expect(response).to redirect_to(admin_index_guidance_path)

From 015cb8a8db28f0e3cf1371d041121f99733b3b68 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Thu, 2 Jun 2022 21:10:17 +0000
Subject: [PATCH 14/95] fixed issue with the :links attribute on templates and
 orgs being defined twice

---
 app/models/org.rb                          | 3 +--
 app/models/template.rb                     | 3 +--
 app/validators/template_links_validator.rb | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/models/org.rb b/app/models/org.rb
index 6b2a48525c..43b19464e1 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -48,13 +48,12 @@ class Org < ApplicationRecord
 
   attribute :feedback_msg, :text, default: feedback_confirmation_default_message
   attribute :language_id, :integer, default: -> { Language.default&.id }
-  attribute :links, :text, default: { org: [] }
 
   # Stores links as an JSON object:
   #  { org: [{"link":"www.example.com","text":"foo"}, ...] }
   # The links are validated against custom validator allocated at
   # validators/template_links_validator.rb
-  serialize :links, JSON
+  serialize :links, JSON, default: { org: [] }
 
   # ================
   # = Associations =
diff --git a/app/models/template.rb b/app/models/template.rb
index 6dae89c083..b2d8366424 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -52,7 +52,7 @@ class Template < ApplicationRecord
   #
   # The links is validated against custom validator allocated at
   # validators/template_links_validator.rb
-  serialize :links, JSON
+  serialize :links, JSON, default: { funder: [], sample_plan: [] }
 
   attribute :published, :boolean, default: false
   attribute :archived, :boolean, default: false
@@ -60,7 +60,6 @@ class Template < ApplicationRecord
   attribute :version, :integer, default: 0
   attribute :customization_of, :integer, default: nil
   attribute :family_id, :integer, default: -> { Template.new_family_id }
-  attribute :links, :text, default: { funder: [], sample_plan: [] }
   # TODO: re-add visibility setting? (this is handled in org_admin/create and
   # relies on the org_id in the current callback-form)
   attribute :visibility, :integer, default: 0
diff --git a/app/validators/template_links_validator.rb b/app/validators/template_links_validator.rb
index cf8d4ce25e..5a60216b8d 100644
--- a/app/validators/template_links_validator.rb
+++ b/app/validators/template_links_validator.rb
@@ -8,11 +8,6 @@ class TemplateLinksValidator < ActiveModel::Validator
   def validate(record)
     links = record.links
     expected_keys = %w[funder sample_plan]
-
-p record.class.name
-p record.inspect
-p "VALIDATOR: #{links.class.name}, #{links.is_a?(Hash)}"
-
     if links.is_a?(Hash)
       expected_keys.each do |k|
         if links.key?(k)

From 0548b08514dc7c64926f96c1c4638e57e6d94c41 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Thu, 2 Jun 2022 21:12:21 +0000
Subject: [PATCH 15/95] fixed issue with the :links attribute on templates and
 orgs being defined twice

---
 app/models/org.rb      | 3 ++-
 app/models/template.rb | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/org.rb b/app/models/org.rb
index 43b19464e1..2efa740c33 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -53,7 +53,8 @@ class Org < ApplicationRecord
   #  { org: [{"link":"www.example.com","text":"foo"}, ...] }
   # The links are validated against custom validator allocated at
   # validators/template_links_validator.rb
-  serialize :links, JSON, default: { org: [] }
+  attribute :links, :text, default: { org: [] }
+  serialize :links, JSON
 
   # ================
   # = Associations =
diff --git a/app/models/template.rb b/app/models/template.rb
index b2d8366424..eaac5f2950 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -52,7 +52,8 @@ class Template < ApplicationRecord
   #
   # The links is validated against custom validator allocated at
   # validators/template_links_validator.rb
-  serialize :links, JSON, default: { funder: [], sample_plan: [] }
+  attribute :links, :text, default: { funder: [], sample_plan: [] }
+  serialize :links, JSON
 
   attribute :published, :boolean, default: false
   attribute :archived, :boolean, default: false
@@ -60,6 +61,7 @@ class Template < ApplicationRecord
   attribute :version, :integer, default: 0
   attribute :customization_of, :integer, default: nil
   attribute :family_id, :integer, default: -> { Template.new_family_id }
+
   # TODO: re-add visibility setting? (this is handled in org_admin/create and
   # relies on the org_id in the current callback-form)
   attribute :visibility, :integer, default: 0

From c58a4120d6b6a22d5d4de3d56b14a410107f0e19 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Thu, 2 Jun 2022 22:48:43 +0000
Subject: [PATCH 16/95] fixed issue with accessing Languages table in
 initializer

---
 app/controllers/orgs_controller.rb       |  5 +++
 app/models/org.rb                        |  7 ++--
 config/initializers/translation.rb       | 48 +++++++++++-------------
 spec/controllers/orgs_controller_spec.rb |  1 -
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index e2d8129f8f..f470d6d13e 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -78,6 +78,11 @@ def admin_update
     # Remove the extraneous Org Selector hidden fields
     attrs = remove_org_selection_params(params_in: attrs)
 
+pp attrs
+junk_org = Org.new(attrs)
+p junk_org.valid?
+p junk_org.errors.full_messages
+
     if @org.update(attrs)
       # Save any identifiers that were found
       if current_user.can_super_admin? && lookup.present?
diff --git a/app/models/org.rb b/app/models/org.rb
index 2efa740c33..e89af44ff7 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -127,9 +127,10 @@ class Org < ApplicationRecord
                     message: _("can't be larger than 500KB")
 
   # allow validations for logo upload
-  dragonfly_accessor :logo do
-    after_assign :resize_image
-  end
+  dragonfly_accessor :logo
+  # dragonfly_accessor :logo do
+  #   after_assign :resize_image
+  # end
 
   # =============
   # = Callbacks =
diff --git a/config/initializers/translation.rb b/config/initializers/translation.rb
index 3fd5ac5394..79ec8e80f8 100644
--- a/config/initializers/translation.rb
+++ b/config/initializers/translation.rb
@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
+# New with Rails 6+, we need to define the list of locales outside the context of
+# the Database since thiss runs during startup. Trying to access the DB causes
+# issues with autoloading; 'DEPRECATION WARNING: Initialization autoloaded the constants ... Language'
+#
+# Note that the entries here must have a corresponding directory in config/locale, a
+# YAML file in config/locales and should also have an entry in the DB's languages table
+SUPPORTED_LOCALES = %w[de en-CA en-GB en-US es fi fr-CA fr-FR pt-BR sv-FI tr-TR].freeze
+# You can define a subset of the locales for your instance's version of Translation.io if applicable
+CLIENT_LOCALES = %w[de en-CA en-GB en-US es fi fr-CA fr-FR pt-BR sv-FI tr-TR].freeze
+DEFAULT_LOCALE = 'en-GB'.freeze
+
 # Here we define the translation domains for the Roadmap application, `app` will
 # contain translations from the open-source repository and ignore the contents
 # of the `app/views/branded` directory.  The `client` domain will
@@ -13,7 +24,7 @@
   TranslationIO.configure do |config|
     config.api_key              = ENV['TRANSLATION_API_ROADMAP']
     config.source_locale        = 'en'
-    config.target_locales       = %w[de en-GB en-US es fr-FR fi sv-FI pt-BR en-CA fr-CA tr-TR]
+    config.target_locales       = SUPPORTED_LOCALES
     config.text_domain          = 'app'
     config.bound_text_domains   = %w[app client]
     config.ignored_source_paths = ['app/views/branded/', 'node_modules/']
@@ -23,7 +34,7 @@
   TranslationIO.configure do |config|
     config.api_key              = ENV['TRANSLATION_API_CLIENT']
     config.source_locale        = 'en'
-    config.target_locales       = %w[fi sv-FI]
+    config.target_locales       = CLIENT_LOCALES
     config.text_domain          = 'client'
     config.bound_text_domains = ['client']
     config.ignored_source_paths = ignore_paths
@@ -51,31 +62,14 @@ def ignore_paths
 end
 
 # Setup languages
-# rubocop:disable Style/RescueModifier
-table = ActiveRecord::Base.connection.table_exists?('languages') rescue false
-# rubocop:enable Style/RescueModifier
-if table
-  def default_locale
-    Language.default.try(:abbreviation) || 'en-GB'
-  end
-
-  def available_locales
-    Language.sorted_by_abbreviation.pluck(:abbreviation).presence || [default_locale]
-  end
-
-  I18n.available_locales = Language.all.pluck(:abbreviation)
-
-  I18n.default_locale = Language.default.try(:abbreviation) || 'en-GB'
-else
-  def default_locale
-    Rails.application.config.i18n.available_locales.first || 'en-GB'
-  end
+def default_locale
+  DEFAULT_LOCALE
+end
 
-  def available_locales
-    Rails.application.config.i18n.available_locales = %w[en-GB en-US]
-  end
+def available_locales
+  SUPPORTED_LOCALES.sort { |a, b| a <=> b }
+end
 
-  I18n.available_locales = ['en-GB']
+I18n.available_locales = SUPPORTED_LOCALES
 
-  I18n.default_locale = 'en-GB'
-end
+I18n.default_locale = DEFAULT_LOCALE
diff --git a/spec/controllers/orgs_controller_spec.rb b/spec/controllers/orgs_controller_spec.rb
index f2d9400adc..5bba3235fd 100644
--- a/spec/controllers/orgs_controller_spec.rb
+++ b/spec/controllers/orgs_controller_spec.rb
@@ -10,7 +10,6 @@
     @org = create(:org)
     @user = create(:user, :super_admin, org: @org)
     @logo = Rack::Test::UploadedFile.new 'spec/support/mocks/logo_file.png', 'image/png'
-
     @controller = OrgsController.new
   end
 

From 5257a833d54bd9cd60aaad2a7b07b049c67ad7ee Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 7 Jun 2022 08:08:53 +0200
Subject: [PATCH 17/95] Imported Tinymce Oxide skin CSS into public folder and
 removed older skin CSS

---
 app/assets/stylesheets/application.scss       |    4 +-
 app/javascript/src/utils/tinymce.js.erb       |    2 +-
 .../skins/lightgray/content.inline.min.css    |    1 -
 .../tinymce/skins/lightgray/content.min.css   |    1 -
 .../skins/lightgray/content.mobile.min.css    |    1 -
 .../skins/lightgray/fonts/tinymce-small.eot   |  Bin 9492 -> 0 bytes
 .../skins/lightgray/fonts/tinymce-small.svg   |   63 -
 .../skins/lightgray/fonts/tinymce-small.ttf   |  Bin 9304 -> 0 bytes
 .../skins/lightgray/fonts/tinymce-small.woff  |  Bin 9380 -> 0 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.eot |  Bin 18808 -> 0 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.svg |  131 -
 .../tinymce/skins/lightgray/fonts/tinymce.ttf |  Bin 18644 -> 0 bytes
 .../skins/lightgray/fonts/tinymce.woff        |  Bin 18720 -> 0 bytes
 public/tinymce/skins/lightgray/img/anchor.gif |  Bin 53 -> 0 bytes
 public/tinymce/skins/lightgray/img/loader.gif |  Bin 2608 -> 0 bytes
 public/tinymce/skins/lightgray/img/object.gif |  Bin 152 -> 0 bytes
 public/tinymce/skins/lightgray/img/trans.gif  |  Bin 43 -> 0 bytes
 public/tinymce/skins/lightgray/skin.min.css   |    1 -
 .../skins/lightgray/skin.mobile.min.css       |    2 -
 public/tinymce/skins/oxide/content.css        |  732 ++++
 public/tinymce/skins/oxide/content.inline.css |  726 ++++
 .../skins/oxide/content.inline.min.css        |    7 +
 public/tinymce/skins/oxide/content.min.css    |    7 +
 public/tinymce/skins/oxide/content.mobile.css |   29 +
 .../skins/oxide/content.mobile.min.css        |    7 +
 .../fonts/tinymce-mobile.woff                 |  Bin
 public/tinymce/skins/oxide/skin.css           | 3047 +++++++++++++++++
 public/tinymce/skins/oxide/skin.min.css       |    7 +
 public/tinymce/skins/oxide/skin.mobile.css    |  673 ++++
 .../tinymce/skins/oxide/skin.mobile.min.css   |    7 +
 public/tinymce/skins/oxide/skin.shadowdom.css |   37 +
 .../skins/oxide/skin.shadowdom.min.css        |    7 +
 32 files changed, 5288 insertions(+), 204 deletions(-)
 delete mode 100644 public/tinymce/skins/lightgray/content.inline.min.css
 delete mode 100644 public/tinymce/skins/lightgray/content.min.css
 delete mode 100644 public/tinymce/skins/lightgray/content.mobile.min.css
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce-small.eot
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce-small.svg
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce-small.ttf
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce-small.woff
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce.eot
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce.svg
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce.ttf
 delete mode 100644 public/tinymce/skins/lightgray/fonts/tinymce.woff
 delete mode 100644 public/tinymce/skins/lightgray/img/anchor.gif
 delete mode 100644 public/tinymce/skins/lightgray/img/loader.gif
 delete mode 100644 public/tinymce/skins/lightgray/img/object.gif
 delete mode 100644 public/tinymce/skins/lightgray/img/trans.gif
 delete mode 100644 public/tinymce/skins/lightgray/skin.min.css
 delete mode 100644 public/tinymce/skins/lightgray/skin.mobile.min.css
 create mode 100644 public/tinymce/skins/oxide/content.css
 create mode 100644 public/tinymce/skins/oxide/content.inline.css
 create mode 100644 public/tinymce/skins/oxide/content.inline.min.css
 create mode 100644 public/tinymce/skins/oxide/content.min.css
 create mode 100644 public/tinymce/skins/oxide/content.mobile.css
 create mode 100644 public/tinymce/skins/oxide/content.mobile.min.css
 rename public/tinymce/skins/{lightgray => oxide}/fonts/tinymce-mobile.woff (100%)
 create mode 100644 public/tinymce/skins/oxide/skin.css
 create mode 100644 public/tinymce/skins/oxide/skin.min.css
 create mode 100644 public/tinymce/skins/oxide/skin.mobile.css
 create mode 100644 public/tinymce/skins/oxide/skin.mobile.min.css
 create mode 100644 public/tinymce/skins/oxide/skin.shadowdom.css
 create mode 100644 public/tinymce/skins/oxide/skin.shadowdom.min.css

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ebc4124654..58ceda63b6 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -14,6 +14,4 @@
 @import "../../../node_modules/jquery-ui-sass/assets/sass/jquery-ui.scss";
 
 @import "font-awesome-sprockets";
-@import "font-awesome";
-
-@import "tinymce/skins/ui/oxide/skin.css";
\ No newline at end of file
+@import "font-awesome";
\ No newline at end of file
diff --git a/app/javascript/src/utils/tinymce.js.erb b/app/javascript/src/utils/tinymce.js.erb
index b1a474a7c1..ac5599941f 100644
--- a/app/javascript/src/utils/tinymce.js.erb
+++ b/app/javascript/src/utils/tinymce.js.erb
@@ -46,7 +46,7 @@ export const defaultOptions = {
   },
   // editorManager.baseURL is not resolved properly for IE since document.currentScript
   // is not supported, see issue https://github.com/tinymce/tinymce/issues/358
-  skin_url: '/tinymce/skins/lightgray',
+  skin_url: '/tinymce/skins/oxide',
   content_css: ['/tinymce/tinymce.css'],
 };
 /*
diff --git a/public/tinymce/skins/lightgray/content.inline.min.css b/public/tinymce/skins/lightgray/content.inline.min.css
deleted file mode 100644
index e4a77ff459..0000000000
--- a/public/tinymce/skins/lightgray/content.inline.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/content.min.css b/public/tinymce/skins/lightgray/content.min.css
deleted file mode 100644
index 1434177df5..0000000000
--- a/public/tinymce/skins/lightgray/content.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/content.mobile.min.css b/public/tinymce/skins/lightgray/content.mobile.min.css
deleted file mode 100644
index fa69a9d4ec..0000000000
--- a/public/tinymce/skins/lightgray/content.mobile.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{position:absolute;display:inline-block;background-color:green;opacity:.5}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/fonts/tinymce-small.eot b/public/tinymce/skins/lightgray/fonts/tinymce-small.eot
deleted file mode 100644
index b144ba0bd949de3c0f87abdd78b517067169884f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9492
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
a@gt-tewA|!qxK@v&x`Qu4XoB(um1(SgK0(p

diff --git a/public/tinymce/skins/lightgray/fonts/tinymce-small.svg b/public/tinymce/skins/lightgray/fonts/tinymce-small.svg
deleted file mode 100644
index b4ee6f4088..0000000000
--- a/public/tinymce/skins/lightgray/fonts/tinymce-small.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="tinymce-small" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe000;" glyph-name="save" d="M960 80v591.938l-223.938 224.062h-592.062c-44.182 0-80-35.816-80-80v-736c0-44.184 35.818-80 80-80h736c44.184 0 80 35.816 80 80zM576 768h64v-192h-64v192zM704 128h-384v255.882c0.034 0.042 0.076 0.082 0.116 0.118h383.77c0.040-0.036 0.082-0.076 0.116-0.118l-0.002-255.882zM832 128h-64v256c0 35.2-28.8 64-64 64h-384c-35.2 0-64-28.8-64-64v-256h-64v640h64v-192c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v171.010l128-128.072v-490.938z" />
-<glyph unicode="&#xe001;" glyph-name="newdocument" d="M850.746 717.254l-133.492 133.49c-24.888 24.892-74.054 45.256-109.254 45.256h-416c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v544c0 35.2-20.366 84.364-45.254 109.254zM805.49 672.002c6.792-6.796 13.792-19.162 18.894-32.002h-184.384v184.386c12.84-5.1 25.204-12.1 32-18.896l133.49-133.488zM831.884 64h-639.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.77c0.034 0.040 0.076 0.082 0.114 0.114h383.886v-256h256v-511.884c-0.034-0.040-0.076-0.082-0.116-0.116z" />
-<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
-<glyph unicode="&#xe003;" glyph-name="alignleft" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h576v-128h-576zM64 192h576v-128h-576z" />
-<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM256 576h512v-128h-512zM256 192h512v-128h-512z" />
-<glyph unicode="&#xe005;" glyph-name="alignright" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM384 576h576v-128h-576zM384 192h576v-128h-576z" />
-<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h896v-128h-896zM64 192h896v-128h-896z" />
-<glyph unicode="&#xe007;" glyph-name="cut" d="M864.408 289.868c-46.47 46.47-106.938 68.004-161.082 62.806l-63.326 63.326 192 192c0 0 128 128 0 256l-320-320-320 320c-128-128 0-256 0-256l192-192-63.326-63.326c-54.144 5.198-114.61-16.338-161.080-62.806-74.98-74.98-85.112-186.418-22.626-248.9 62.482-62.482 173.92-52.354 248.9 22.626 46.47 46.468 68.002 106.938 62.806 161.080l63.326 63.326 63.328-63.328c-5.196-54.144 16.336-114.61 62.806-161.078 74.978-74.98 186.418-85.112 248.898-22.626 62.488 62.482 52.356 173.918-22.624 248.9zM353.124 201.422c-2.212-24.332-15.020-49.826-35.14-69.946-22.212-22.214-51.080-35.476-77.218-35.476-10.524 0-25.298 2.228-35.916 12.848-21.406 21.404-17.376 73.132 22.626 113.136 22.212 22.214 51.080 35.476 77.218 35.476 10.524 0 25.298-2.228 35.916-12.848 13.112-13.11 13.47-32.688 12.514-43.19zM512 352c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.654-64-64-64zM819.152 108.848c-10.62-10.62-25.392-12.848-35.916-12.848-26.138 0-55.006 13.262-77.218 35.476-20.122 20.12-32.928 45.614-35.138 69.946-0.958 10.502-0.6 30.080 12.514 43.192 10.618 10.622 25.39 12.848 35.916 12.848 26.136 0 55.006-13.262 77.216-35.474 40.004-40.008 44.032-91.736 22.626-113.14z" />
-<glyph unicode="&#xe008;" glyph-name="paste" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h384l192 192v384h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM704 90.51v101.49h101.49l-101.49-101.49zM832 256h-192v-192h-256v448h448v-256z" />
-<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M888 576h-56v256h64v64h-320v-64h64v-256h-256v256h64v64h-320v-64h64v-256h-56c-39.6 0-72-32.4-72-72v-432c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v312h128v-312c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v432c0 39.6-32.4 72-72 72zM348 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM860 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
-<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM128 768c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 448c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 128c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64z" />
-<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM320 430v146h-64v320h-128v-64h64v-256h-64v-64h128v-50l-128-60v-146h128v-64h-128v-64h128v-64h-128v-64h192v320h-128v50z" />
-<glyph unicode="&#xe00c;" glyph-name="indent" d="M64 768h896v-128h-896zM384 384h576v-128h-576zM384 576h576v-128h-576zM64 192h896v-128h-896zM64 576l224-160-224-160z" />
-<glyph unicode="&#xe00d;" glyph-name="outdent" d="M64 768h896v-128h-896zM64 384h576v-128h-576zM64 576h576v-128h-576zM64 192h896v-128h-896zM960 576l-224-160 224-160z" />
-<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M256.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.954-10.578-19.034-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498zM768.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.956-10.578-19.036-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498z" />
-<glyph unicode="&#xe00f;" glyph-name="undo" d="M704 0c59 199 134.906 455.266-256 446.096v-222.096l-336.002 336 336.002 336v-217.326c468.092 12.2 544-358.674 256-678.674z" />
-<glyph unicode="&#xe010;" glyph-name="redo" d="M576 678.674v217.326l336.002-336-336.002-336v222.096c-390.906 9.17-315-247.096-256-446.096-288 320-212.092 690.874 256 678.674z" />
-<glyph unicode="&#xe011;" glyph-name="unlink" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM352 250c-9.724 0-19.45 3.71-26.87 11.128-14.84 14.84-14.84 38.898 0 53.738l320 320c14.84 14.84 38.896 14.84 53.736 0 14.844-14.84 14.844-38.9 0-53.74l-320-320c-7.416-7.416-17.142-11.126-26.866-11.126z" />
-<glyph unicode="&#xe012;" glyph-name="link" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM800 122c-9.724 0-19.45 3.708-26.87 11.13l-128 127.998c-14.844 14.84-14.844 38.898 0 53.738 14.84 14.844 38.896 14.844 53.736 0l128-128c14.844-14.84 14.844-38.896 0-53.736-7.416-7.422-17.142-11.13-26.866-11.13zM608 0c-17.674 0-32 14.326-32 32v128c0 17.674 14.326 32 32 32s32-14.326 32-32v-128c0-17.674-14.326-32-32-32zM928 320h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32h128c17.674 0 32-14.326 32-32s-14.326-32-32-32zM224 774c9.724 0 19.45-3.708 26.87-11.13l128-128c14.842-14.84 14.842-38.898 0-53.738-14.84-14.844-38.898-14.844-53.738 0l-128 128c-14.842 14.84-14.842 38.898 0 53.738 7.418 7.422 17.144 11.13 26.868 11.13zM416 896c17.674 0 32-14.326 32-32v-128c0-17.674-14.326-32-32-32s-32 14.326-32 32v128c0 17.674 14.326 32 32 32zM96 576h128c17.674 0 32-14.326 32-32s-14.326-32-32-32h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32z" />
-<glyph unicode="&#xe013;" glyph-name="bookmark" d="M256 896v-896l256 256 256-256v896h-512zM704 170.51l-192 192-192-192v661.49h384v-661.49z" />
-<glyph unicode="&#xe014;" glyph-name="image" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM896 128.116c-0.012-0.014-0.030-0.028-0.042-0.042l-191.958 319.926-160-128-224 288-191.968-479.916c-0.010 0.010-0.022 0.022-0.032 0.032v639.77c0.034 0.040 0.076 0.082 0.114 0.114h767.77c0.040-0.034 0.082-0.076 0.116-0.116v-639.768zM640 608c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z" />
-<glyph unicode="&#xe015;" glyph-name="media" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM256 128h-128v128h128v-128zM256 384h-128v128h128v-128zM256 640h-128v128h128v-128zM704 128h-384v640h384v-640zM896 128h-128v128h128v-128zM896 384h-128v128h128v-128zM896 640h-128v128h128v-128zM384 640v-384l288 192z" />
-<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128v128zM704 704c35.346 0 64-28.654 64-64v-166l-228-154h-92v64l192 128v64h-320v128h384zM512 896c-119.666 0-232.166-46.6-316.784-131.216-84.614-84.618-131.216-197.118-131.216-316.784 0-119.664 46.602-232.168 131.216-316.784 84.618-84.616 197.118-131.216 316.784-131.216 119.664 0 232.168 46.6 316.784 131.216s131.216 197.12 131.216 316.784c0 119.666-46.6 232.166-131.216 316.784-84.616 84.616-197.12 131.216-316.784 131.216z" />
-<glyph unicode="&#xe017;" glyph-name="code" d="M416 256l-192 192 192 192-64 64-256-256 256-256zM672 704l-64-64 192-192-192-192 64-64 256 256z" />
-<glyph unicode="&#xe018;" glyph-name="insertdatetime" d="M77.798 655.376l81.414-50.882c50.802 81.114 128.788 143.454 221.208 174.246l-30.366 91.094c-113.748-37.898-209.728-114.626-272.256-214.458zM673.946 869.834l-30.366-91.094c92.422-30.792 170.404-93.132 221.208-174.248l81.412 50.882c-62.526 99.834-158.506 176.562-272.254 214.46zM607.974 255.992c-4.808 0-9.692 1.090-14.286 3.386l-145.688 72.844v211.778c0 17.672 14.328 32 32 32s32-14.328 32-32v-172.222l110.31-55.156c15.806-7.902 22.214-27.124 14.31-42.932-5.604-11.214-16.908-17.696-28.646-17.698zM512 768c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384zM512 96c-159.058 0-288 128.942-288 288s128.942 288 288 288c159.058 0 288-128.942 288-288s-128.942-288-288-288z" />
-<glyph unicode="&#xe019;" glyph-name="preview" d="M64 504.254c45.318 49.92 97.162 92.36 153.272 125.124 90.332 52.744 192.246 80.622 294.728 80.622 102.48 0 204.396-27.878 294.726-80.624 56.112-32.764 107.956-75.204 153.274-125.124v117.432c-33.010 28.118-68.124 53.14-104.868 74.594-105.006 61.314-223.658 93.722-343.132 93.722s-238.128-32.408-343.134-93.72c-36.742-21.454-71.856-46.478-104.866-74.596v-117.43zM512 640c-183.196 0-345.838-100.556-448-256 102.162-155.448 264.804-256 448-256s345.838 100.552 448 256c-102.162 155.444-264.804 256-448 256zM512 448c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.348 28.654 64 64 64s64-28.652 64-64zM728.066 263.338c-67.434-39.374-140.128-59.338-216.066-59.338s-148.632 19.964-216.066 59.338c-51.554 30.104-98.616 71.31-138.114 120.662 39.498 49.35 86.56 90.558 138.116 120.66 13.276 7.752 26.758 14.74 40.426 20.982-10.512-23.742-16.362-50.008-16.362-77.642 0-106.040 85.962-192 192-192 106.040 0 192 85.96 192 192 0 27.634-5.85 53.9-16.36 77.642 13.668-6.244 27.15-13.23 40.426-20.982 51.554-30.102 98.616-71.31 138.116-120.66-39.498-49.352-86.56-90.558-138.116-120.662z" />
-<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M651.168 676.166c-24.612 81.962-28.876 91.834-107.168 91.834h-64c-79.618 0-82.664-10.152-108.418-96 0-0.002 0-0.002-0.002-0.004l-143.998-479.996h113.636l57.6 192h226.366l57.6-192h113.63l-145.246 484.166zM437.218 512l38.4 136c10.086 33.618 36.38 30 36.38 30s26.294 3.618 36.38-30h0.004l38.4-136h-149.564z" />
-<glyph unicode="&#xe01b;" glyph-name="table" d="M64 768v-704h896v704h-896zM384 320v128h256v-128h-256zM640 256v-128h-256v128h256zM640 640v-128h-256v128h256zM320 640v-128h-192v128h192zM128 448h192v-128h-192v128zM704 448h192v-128h-192v128zM704 512v128h192v-128h-192zM128 256h192v-128h-192v128zM704 128v128h192v-128h-192z" />
-<glyph unicode="&#xe01c;" glyph-name="hr" d="M64 512h896v-128h-896z" />
-<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M64 192h512v-128h-512v128zM768 768h-220.558l-183.766-512h-132.288l183.762 512h-223.15v128h576v-128zM929.774 64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774-62.226-62.226z" />
-<glyph unicode="&#xe01e;" glyph-name="subscript" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe01f;" glyph-name="superscript" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 128v37.004c151.348 61.628 256 193.82 256 346.996 0 212.078-200.576 384-448 384s-448-171.922-448-384c0-153.176 104.654-285.368 256-346.996v-37.004h-192l-64 96v-224h320v222.812c-100.9 51.362-170.666 161.54-170.666 289.188 0 176.732 133.718 320 298.666 320s298.666-143.268 298.666-320c0-127.648-69.766-237.826-170.666-289.188v-222.812h320v224l-64-96h-192z" />
-<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 820c99.366 0 192.782-38.694 263.042-108.956s108.958-163.678 108.958-263.044-38.696-192.782-108.958-263.042-163.676-108.958-263.042-108.958-192.782 38.696-263.044 108.958-108.956 163.676-108.956 263.042 38.694 192.782 108.956 263.044 163.678 108.956 263.044 108.956zM512 896c-247.424 0-448-200.576-448-448s200.576-448 448-448 448 200.576 448 448-200.576 448-448 448v0zM320 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM576 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM512 304c-101.84 0-192.56 36.874-251.166 94.328 23.126-117.608 126.778-206.328 251.166-206.328s228.040 88.72 251.168 206.328c-58.608-57.454-149.328-94.328-251.168-94.328z" />
-<glyph unicode="&#xe022;" glyph-name="print" d="M256 832h512v-128h-512v128zM896 640h-768c-35.2 0-64-28.8-64-64v-256c0-35.2 28.796-64 64-64h128v-192h512v192h128c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM704 128h-384v256h384v-256zM910.4 544c0-25.626-20.774-46.4-46.398-46.4s-46.402 20.774-46.402 46.4 20.778 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
-<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M480 576l-192 192 128 128h-352v-352l128 128 192-192zM640 480l192 192 128-128v352h-352l128-128-192-192zM544 320l192-192-128-128h352v352l-128-128-192 192zM384 416l-192-192-128 128v-352h352l-128 128 192 192z" />
-<glyph unicode="&#xe024;" glyph-name="spellcheck" d="M960 832v64h-192c-35.202 0-64-28.8-64-64v-320c0-15.856 5.858-30.402 15.496-41.614l-303.496-260.386-142 148-82-70 224-288 416 448h128v64h-192v320h192zM256 448h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192h128v-192zM128 704v128h128v-128h-128zM640 512v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64zM448 832h128v-128h-128v128zM448 640h128v-128h-128v128z" />
-<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 448h-128v128h128v128h128v-128h128v-128h-128v-128h-128v128zM960 384v-320h-896v320h128v-192h640v192h128z" />
-<glyph unicode="&#xe026;" glyph-name="template" d="M512 576h128v-64h-128zM512 192h128v-64h-128zM576 384h128v-64h-128zM768 384v-192h-64v-64h128v256zM384 384h128v-64h-128zM320 192h128v-64h-128zM320 576h128v-64h-128zM192 768v-256h64v192h64v64zM704 512h128v256h-64v-192h-64zM64 896v-896h896v896h-896zM896 64h-768v768h768v-768zM192 384v-256h64v192h64v64zM576 768h128v-64h-128zM384 768h128v-64h-128z" />
-<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M816 896l16-384h-640l16 384h32l16-320h512l16 320h32zM208 0l-16 320h640l-16-320h-32l-16 256h-512l-16-256h-32zM64 448h128v-64h-128zM256 448h128v-64h-128zM448 448h128v-64h-128zM640 448h128v-64h-128zM832 448h128v-64h-128z" />
-<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
-<glyph unicode="&#xe02a;" glyph-name="bold" d="M625.442 465.818c48.074 38.15 78.558 94.856 78.558 158.182 0 114.876-100.29 208-224 208h-224v-768h288c123.712 0 224 93.124 224 208 0 88.196-59.118 163.562-142.558 193.818zM384 656c0 26.51 21.49 48 48 48h67.204c42.414 0 76.796-42.98 76.796-96s-34.382-96-76.796-96h-115.204v144zM547.2 192h-115.2c-26.51 0-48 21.49-48 48v144h163.2c42.418 0 76.8-42.98 76.8-96s-34.382-96-76.8-96z" />
-<glyph unicode="&#xe02b;" glyph-name="italic" d="M832 832v-64h-144l-256-640h144v-64h-448v64h144l256 640h-144v64h448z" />
-<glyph unicode="&#xe02c;" glyph-name="underline" d="M192 128h576v-64h-576v64zM640 832v-384c0-31.312-14.7-61.624-41.39-85.352-30.942-27.502-73.068-42.648-118.61-42.648-45.544 0-87.668 15.146-118.608 42.648-26.692 23.728-41.392 54.040-41.392 85.352v384h-128v-384c0-141.382 128.942-256 288-256s288 114.618 288 256v384h-128z" />
-<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M960 448h-265.876c-50.078 35.42-114.43 54.86-182.124 54.86-89.206 0-164.572 50.242-164.572 109.712s75.366 109.714 164.572 109.714c75.058 0 140.308-35.576 159.12-82.286h113.016c-7.93 50.644-37.58 97.968-84.058 132.826-50.88 38.16-117.676 59.174-188.078 59.174-70.404 0-137.196-21.014-188.074-59.174-54.788-41.090-86.212-99.502-86.212-160.254s31.424-119.164 86.212-160.254c1.956-1.466 3.942-2.898 5.946-4.316h-265.872v-64h512.532c58.208-17.106 100.042-56.27 100.042-100.572 0-59.468-75.368-109.71-164.572-109.71-75.060 0-140.308 35.574-159.118 82.286h-113.016c7.93-50.64 37.582-97.968 84.060-132.826 50.876-38.164 117.668-59.18 188.072-59.18 70.402 0 137.198 21.016 188.074 59.174 54.79 41.090 86.208 99.502 86.208 160.254 0 35.298-10.654 69.792-30.294 100.572h204.012v64z" />
-<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448z" />
-<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM64 64l224 192-224 192z" />
-<glyph unicode="&#xe030;" glyph-name="rtl" d="M320 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM960 448l-224-192 224-192z" />
-<glyph unicode="&#xe031;" glyph-name="copy" d="M832 640h-192v64l-192 192h-384v-704h384v-192h576v448l-192 192zM832 549.49l101.49-101.49h-101.49v101.49zM448 805.49l101.49-101.49h-101.49v101.49zM128 832h256v-192h192v-384h-448v576zM960 64h-448v128h128v384h128v-192h192v-320z" />
-<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
-<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM840.34 256h87.66l32 448h-896l64-640h356.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM874.996 110.25l-134.496 110.692c17.454 28.922 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l110.692-134.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM576 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
-<glyph unicode="&#xe035;" glyph-name="pastetext" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h576v576h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM832 64h-448v448h448v-448zM448 448v-128h32l32 64h64v-192h-48v-64h160v64h-48v192h64l32-64h32v128z" />
-<glyph unicode="&#xe603;" glyph-name="codesample" d="M200.015 577.994v103.994c0 43.077 34.919 77.997 77.997 77.997h26v103.994h-26c-100.51 0-181.991-81.481-181.991-181.991v-103.994c0-43.077-34.919-77.997-77.997-77.997h-26v-103.994h26c43.077 0 77.997-34.919 77.997-77.997v-103.994c0-100.509 81.481-181.991 181.991-181.991h26v103.994h-26c-43.077 0-77.997 34.919-77.997 77.997v103.994c0 50.927-20.928 96.961-54.642 129.994 33.714 33.032 54.642 79.065 54.642 129.994zM823.985 577.994v103.994c0 43.077-34.919 77.997-77.997 77.997h-26v103.994h26c100.509 0 181.991-81.481 181.991-181.991v-103.994c0-43.077 34.919-77.997 77.997-77.997h26v-103.994h-26c-43.077 0-77.997-34.919-77.997-77.997v-103.994c0-100.509-81.482-181.991-181.991-181.991h-26v103.994h26c43.077 0 77.997 34.919 77.997 77.997v103.994c0 50.927 20.928 96.961 54.642 129.994-33.714 33.032-54.642 79.065-54.642 129.994zM615.997 603.277c0-57.435-46.56-103.994-103.994-103.994s-103.994 46.56-103.994 103.994c0 57.435 46.56 103.994 103.994 103.994s103.994-46.56 103.994-103.994zM512 448.717c-57.435 0-103.994-46.56-103.994-103.994 0-55.841 26-100.107 105.747-103.875-23.715-33.413-59.437-46.608-105.747-50.94v-61.747c0 0 207.991-18.144 207.991 216.561-0.202 57.437-46.56 103.996-103.994 103.996z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/public/tinymce/skins/lightgray/fonts/tinymce-small.ttf
deleted file mode 100644
index a983e2dc4cb30880fffe00e1f0879be4d95eb4cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9304
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
V|H?UnQG1YRcKGiNtkxZ`{{_U;RE_`u

diff --git a/public/tinymce/skins/lightgray/fonts/tinymce-small.woff b/public/tinymce/skins/lightgray/fonts/tinymce-small.woff
deleted file mode 100644
index d8962df76e50488c6520c0dadf3220080aaae9fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9380
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

diff --git a/public/tinymce/skins/lightgray/fonts/tinymce.eot b/public/tinymce/skins/lightgray/fonts/tinymce.eot
deleted file mode 100644
index 5336c38ff5206392d145d4feb00cd19b10e5614d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18808
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
M7B?A~<rSa*3w+Ta=>Px#

diff --git a/public/tinymce/skins/lightgray/fonts/tinymce.svg b/public/tinymce/skins/lightgray/fonts/tinymce.svg
deleted file mode 100644
index 9fa215f3d6..0000000000
--- a/public/tinymce/skins/lightgray/fonts/tinymce.svg
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="tinymce" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe000;" glyph-name="save" d="M896 960h-896v-1024h1024v896l-128 128zM512 832h128v-256h-128v256zM896 64h-768v768h64v-320h576v320h74.978l53.022-53.018v-714.982z" />
-<glyph unicode="&#xe001;" glyph-name="newdocument" d="M903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.34-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
-<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
-<glyph unicode="&#xe003;" glyph-name="alignleft" d="M0 896h1024v-128h-1024zM0 704h640v-128h-640zM0 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M0 896h1024v-128h-1024zM192 704h640v-128h-640zM192 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe005;" glyph-name="alignright" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M0 896h1024v-128h-1024zM0 704h1024v-128h-1024zM0 512h1024v-128h-1024zM0 320h1024v-128h-1024zM0 128h1024v-128h-1024z" />
-<glyph unicode="&#xe007;" glyph-name="cut" d="M890.774 250.846c-45.654 45.556-103.728 69.072-157.946 69.072h-29.112l-63.904 64.008 255.62 256.038c63.904 64.010 63.904 192.028 0 256.038l-383.43-384.056-383.432 384.054c-63.904-64.008-63.904-192.028 0-256.038l255.622-256.034-63.906-64.008h-29.114c-54.22 0-112.292-23.518-157.948-69.076-81.622-81.442-92.65-202.484-24.63-270.35 29.97-29.902 70.288-44.494 112.996-44.494 54.216 0 112.29 23.514 157.946 69.072 53.584 53.464 76.742 124 67.084 185.348l65.384 65.488 65.376-65.488c-9.656-61.348 13.506-131.882 67.084-185.348 45.662-45.558 103.732-69.072 157.948-69.072 42.708 0 83.024 14.592 112.994 44.496 68.020 67.866 56.988 188.908-24.632 270.35zM353.024 114.462c-7.698-17.882-19.010-34.346-33.626-48.926-14.636-14.604-31.172-25.918-49.148-33.624-16.132-6.916-32.96-10.568-48.662-10.568-15.146 0-36.612 3.402-52.862 19.612-16.136 16.104-19.52 37.318-19.52 52.288 0 15.542 3.642 32.21 10.526 48.212 7.7 17.884 19.014 34.346 33.626 48.926 14.634 14.606 31.172 25.914 49.15 33.624 16.134 6.914 32.96 10.568 48.664 10.568 15.146 0 36.612-3.4 52.858-19.614 16.134-16.098 19.522-37.316 19.522-52.284 0.002-15.542-3.638-32.216-10.528-48.214zM512.004 293.404c-49.914 0-90.376 40.532-90.376 90.526 0 49.992 40.462 90.52 90.376 90.52s90.372-40.528 90.372-90.52c0-49.998-40.46-90.526-90.372-90.526zM855.272 40.958c-16.248-16.208-37.712-19.612-52.86-19.612-15.704 0-32.53 3.652-48.666 10.568-17.972 7.706-34.508 19.020-49.142 33.624-14.614 14.58-25.926 31.042-33.626 48.926-6.886 15.998-10.526 32.672-10.526 48.212 0 14.966 3.384 36.188 19.52 52.286 16.246 16.208 37.712 19.614 52.86 19.614 15.7 0 32.53-3.654 48.66-10.568 17.978-7.708 34.516-19.018 49.15-33.624 14.61-14.58 25.924-31.042 33.626-48.926 6.884-15.998 10.526-32.67 10.526-48.212-0.002-14.97-3.39-36.186-19.522-52.288z" />
-<glyph unicode="&#xe008;" glyph-name="paste" d="M832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h448l192 192v512h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM832 26.51v101.49h101.49l-101.49-101.49zM960 192h-192v-192h-320v576h512v-384z" />
-<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M64 960h384v-64h-384zM576 960h384v-64h-384zM952 640h-56v256h-256v-256h-256v256h-256v-256h-56c-39.6 0-72-32.4-72-72v-560c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v376h128v-376c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v560c0 39.6-32.4 72-72 72zM348 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM924 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
-<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 896h640v-128h-640v128zM384 512h640v-128h-640v128zM384 128h640v-128h-640v128zM0 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 448c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 64c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128z" />
-<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 128h640v-128h-640zM384 512h640v-128h-640zM384 896h640v-128h-640zM192 960v-256h-64v192h-64v64zM128 434v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM256 256v-320h-192v64h128v64h-128v64h128v64h-128v64z" />
-<glyph unicode="&#xe00c;" glyph-name="indent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM0 256v384l256-192z" />
-<glyph unicode="&#xe00d;" glyph-name="outdent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM256 640v-384l-256 192z" />
-<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M225 512c123.712 0 224-100.29 224-224 0-123.712-100.288-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.634-11.636-22.252-24.016-31.83-37.020 11.438 1.8 23.16 2.746 35.104 2.746zM801 512c123.71 0 224-100.29 224-224 0-123.712-100.29-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.636-11.636-22.254-24.016-31.832-37.020 11.44 1.8 23.16 2.746 35.106 2.746z" />
-<glyph unicode="&#xe00f;" glyph-name="undo" d="M761.862-64c113.726 206.032 132.888 520.306-313.862 509.824v-253.824l-384 384 384 384v-248.372c534.962 13.942 594.57-472.214 313.862-775.628z" />
-<glyph unicode="&#xe010;" glyph-name="redo" d="M576 711.628v248.372l384-384-384-384v253.824c-446.75 10.482-427.588-303.792-313.86-509.824-280.712 303.414-221.1 789.57 313.86 775.628z" />
-<glyph unicode="&#xe011;" glyph-name="link" d="M320 256c17.6-17.6 47.274-16.726 65.942 1.942l316.118 316.116c18.668 18.668 19.54 48.342 1.94 65.942s-47.274 16.726-65.942-1.942l-316.116-316.116c-18.668-18.668-19.542-48.342-1.942-65.942zM476.888 284.888c4.56-9.050 6.99-19.16 6.99-29.696 0-17.616-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.382 99.382c-12.248 12.248-18.992 28.694-18.992 46.308s6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994 10.536 0 20.644-2.43 29.696-6.99l65.338 65.338c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-60.67-60.67-60.67-159.948 0-220.618l99.382-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c55.82 55.82 60.238 144.298 13.344 205.344l-65.34-65.34zM978.498 815.116l-99.382 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994s34.060-6.746 46.308-18.994l99.382-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c60.67 60.666 60.67 159.944 0 220.614z" />
-<glyph unicode="&#xe012;" glyph-name="unlink" d="M476.888 284.886c4.56-9.048 6.99-19.158 6.99-29.696 0-17.616-6.744-34.058-18.992-46.308l-163.38-163.38c-12.248-12.248-28.696-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.38 99.38c-12.248 12.25-18.992 28.696-18.992 46.308s6.744 34.060 18.992 46.308l163.38 163.382c12.248 12.246 28.696 18.992 46.308 18.992 10.538 0 20.644-2.43 29.696-6.988l65.338 65.336c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.38-163.382c-60.67-60.67-60.67-159.95 0-220.618l99.38-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.38 163.38c55.82 55.82 60.238 144.298 13.344 205.346l-65.34-65.338zM978.496 815.116l-99.38 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.97-15.166-110.306-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.246 12.248 28.694 18.994 46.306 18.994 17.616 0 34.060-6.746 46.308-18.994l99.38-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.38-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.504l163.38 163.38c60.672 60.666 60.672 159.944 0 220.614zM233.368 681.376l-191.994 191.994 45.256 45.256 191.994-191.994zM384 960h64v-192h-64zM0 576h192v-64h-192zM790.632 214.624l191.996-191.996-45.256-45.256-191.996 191.996zM576 128h64v-192h-64zM832 384h192v-64h-192z" />
-<glyph unicode="&#xe013;" glyph-name="anchor" d="M192 960v-1024l320 320 320-320v1024h-640zM768 90.51l-256 256-256-256v805.49h512v-805.49z" />
-<glyph unicode="&#xe014;" glyph-name="image" d="M0 832v-832h1024v832h-1024zM960 64h-896v704h896v-704zM704 608c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM896 128h-768l192 512 256-320 128 96z" />
-<glyph unicode="&#xe015;" glyph-name="media" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" />
-<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
-<glyph unicode="&#xe017;" glyph-name="code" d="M320 704l-256-256 256-256h128l-256 256 256 256zM704 704h-128l256-256-256-256h128l256 256z" />
-<glyph unicode="&#xe018;" glyph-name="inserttime" d="M512 768c-212.076 0-384-171.922-384-384s171.922-384 384-384c212.074 0 384 171.922 384 384s-171.926 384-384 384zM715.644 180.354c-54.392-54.396-126.716-84.354-203.644-84.354s-149.25 29.958-203.646 84.354c-54.396 54.394-84.354 126.718-84.354 203.646s29.958 149.25 84.354 203.646c54.396 54.396 126.718 84.354 203.646 84.354s149.252-29.958 203.642-84.354c54.402-54.396 84.358-126.718 84.358-203.646s-29.958-149.252-84.356-203.646zM325.93 756.138l-42.94 85.878c-98.874-49.536-179.47-130.132-229.006-229.008l85.876-42.94c40.248 80.336 105.732 145.822 186.070 186.070zM884.134 570.070l85.878 42.938c-49.532 98.876-130.126 179.472-229.004 229.008l-42.944-85.878c80.338-40.248 145.824-105.732 186.070-186.068zM512 576h-64v-192c0-10.11 4.7-19.11 12.022-24.972l-0.012-0.016 160-128 39.976 49.976-147.986 118.39v176.622z" />
-<glyph unicode="&#xe019;" glyph-name="preview" d="M512 640c-209.368 0-395.244-100.556-512-256 116.756-155.446 302.632-256 512-256s395.244 100.554 512 256c-116.756 155.444-302.632 256-512 256zM448 512c35.346 0 64-28.654 64-64s-28.654-64-64-64-64 28.654-64 64 28.654 64 64 64zM773.616 254.704c-39.648-20.258-81.652-35.862-124.846-46.376-44.488-10.836-90.502-16.328-136.77-16.328-46.266 0-92.282 5.492-136.768 16.324-43.194 10.518-85.198 26.122-124.846 46.376-63.020 32.202-120.222 76.41-167.64 129.298 47.418 52.888 104.62 97.1 167.64 129.298 32.336 16.522 66.242 29.946 101.082 40.040-19.888-30.242-31.468-66.434-31.468-105.336 0-106.040 85.962-192 192-192s192 85.96 192 192c0 38.902-11.582 75.094-31.466 105.34 34.838-10.096 68.744-23.52 101.082-40.042 63.022-32.198 120.218-76.408 167.638-129.298-47.42-52.886-104.618-97.1-167.638-129.296zM860.918 716.278c-108.72 55.554-226.112 83.722-348.918 83.722s-240.198-28.168-348.918-83.722c-58.772-30.032-113.732-67.904-163.082-112.076v-109.206c55.338 58.566 120.694 107.754 192.194 144.29 99.62 50.904 207.218 76.714 319.806 76.714s220.186-25.81 319.804-76.716c71.502-36.536 136.858-85.724 192.196-144.29v109.206c-49.35 44.174-104.308 82.046-163.082 112.078z" />
-<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M322.018 128l57.6 192h264.764l57.6-192h113.632l-191.996 640h-223.236l-192-640h113.636zM475.618 640h72.764l57.6-192h-187.964l57.6 192z" />
-<glyph unicode="&#xe01b;" glyph-name="table" d="M0 896v-896h1024v896h-1024zM384 320v192h256v-192h-256zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe01c;" glyph-name="hr" d="M0 512h1024v-128h-1024z" />
-<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M0 64h576v-128h-576zM192 960h704v-128h-704zM277.388 128l204.688 784.164 123.85-32.328-196.25-751.836zM929.774-64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774z" />
-<glyph unicode="&#xe01e;" glyph-name="sub" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe01f;" glyph-name="sup" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
-<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 64h256l64 128v-256h-384v214.214c131.112 56.484 224 197.162 224 361.786 0 214.432-157.598 382.266-352 382.266-194.406 0-352-167.832-352-382.266 0-164.624 92.886-305.302 224-361.786v-214.214h-384v256l64-128h256v32.59c-187.63 66.46-320 227.402-320 415.41 0 247.424 229.23 448 512 448s512-200.576 512-448c0-188.008-132.37-348.95-320-415.41v-32.59z" />
-<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 960c-282.77 0-512-229.228-512-512 0-282.77 229.228-512 512-512 282.77 0 512 229.23 512 512 0 282.772-229.23 512-512 512zM512 16c-238.586 0-432 193.412-432 432 0 238.586 193.414 432 432 432 238.59 0 432-193.414 432-432 0-238.588-193.41-432-432-432zM384 640c0-35.346-28.654-64-64-64s-64 28.654-64 64 28.654 64 64 64 64-28.654 64-64zM768 640c0-35.346-28.652-64-64-64s-64 28.654-64 64 28.652 64 64 64 64-28.654 64-64zM512 308c141.074 0 262.688 57.532 318.462 123.192-20.872-171.22-156.288-303.192-318.462-303.192-162.118 0-297.498 132.026-318.444 303.168 55.786-65.646 177.386-123.168 318.444-123.168z" />
-<glyph unicode="&#xe022;" glyph-name="print" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
-<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M1024 960v-384l-138.26 138.26-212-212-107.48 107.48 212 212-138.26 138.26zM245.74 821.74l212-212-107.48-107.48-212 212-138.26-138.26v384h384zM885.74 181.74l138.26 138.26v-384h-384l138.26 138.26-212 212 107.48 107.48zM457.74 286.26l-212-212 138.26-138.26h-384v384l138.26-138.26 212 212z" />
-<glyph unicode="&#xe024;" glyph-name="spellchecker" d="M128 704h128v-192h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192zM128 896h128v-128h-128v128zM960 896v64h-192c-35.202 0-64-28.8-64-64v-320c0-35.2 28.798-64 64-64h192v64h-192v320h192zM640 800v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64zM576 576h-128v128h128v-128zM576 768h-128v128h128v-128zM832 384l-416-448-224 288 82 70 142-148 352 302z" />
-<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 384h-192v128h192v192h128v-192h192v-128h-192v-192h-128zM1024 320v-384h-1024v384h128v-256h768v256z" />
-<glyph unicode="&#xe026;" glyph-name="template" d="M384 768h128v-64h-128zM576 768h128v-64h-128zM896 768v-256h-192v64h128v128h-64v64zM320 576h128v-64h-128zM512 576h128v-64h-128zM192 704v-128h64v-64h-128v256h192v-64zM384 384h128v-64h-128zM576 384h128v-64h-128zM896 384v-256h-192v64h128v128h-64v64zM320 192h128v-64h-128zM512 192h128v-64h-128zM192 320v-128h64v-64h-128v256h192v-64zM960 896h-896v-896h896v896zM1024 960v0-1024h-1024v1024h1024z" />
-<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M0 448h128v-64h-128zM192 448h192v-64h-192zM448 448h128v-64h-128zM640 448h192v-64h-192zM896 448h128v-64h-128zM880 960l16-448h-768l16 448h32l16-384h640l16 384zM144-64l-16 384h768l-16-384h-32l-16 320h-640l-16-320z" />
-<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
-<glyph unicode="&#xe02a;" glyph-name="bold" d="M707.88 475.348c37.498 44.542 60.12 102.008 60.12 164.652 0 141.16-114.842 256-256 256h-320v-896h384c141.158 0 256 114.842 256 256 0 92.956-49.798 174.496-124.12 219.348zM384 768h101.5c55.968 0 101.5-57.42 101.5-128s-45.532-128-101.5-128h-101.5v256zM543 128h-159v256h159c58.45 0 106-57.42 106-128s-47.55-128-106-128z" />
-<glyph unicode="&#xe02b;" glyph-name="italic" d="M896 896v-64h-128l-320-768h128v-64h-448v64h128l320 768h-128v64z" />
-<glyph unicode="&#xe02c;" glyph-name="underline" d="M704 896h128v-416c0-159.058-143.268-288-320-288-176.73 0-320 128.942-320 288v416h128v-416c0-40.166 18.238-78.704 51.354-108.506 36.896-33.204 86.846-51.494 140.646-51.494s103.75 18.29 140.646 51.494c33.116 29.802 51.354 68.34 51.354 108.506v416zM192 128h640v-128h-640z" />
-<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M731.42 442.964c63.92-47.938 100.58-116.086 100.58-186.964s-36.66-139.026-100.58-186.964c-59.358-44.518-137.284-69.036-219.42-69.036-82.138 0-160.062 24.518-219.42 69.036-63.92 47.938-100.58 116.086-100.58 186.964h128c0-69.382 87.926-128 192-128s192 58.618 192 128c0 69.382-87.926 128-192 128-82.138 0-160.062 24.518-219.42 69.036-63.92 47.94-100.58 116.086-100.58 186.964s36.66 139.024 100.58 186.964c59.358 44.518 137.282 69.036 219.42 69.036 82.136 0 160.062-24.518 219.42-69.036 63.92-47.94 100.58-116.086 100.58-186.964h-128c0 69.382-87.926 128-192 128s-192-58.618-192-128c0-69.382 87.926-128 192-128 82.136 0 160.062-24.518 219.42-69.036zM0 448h1024v-64h-1024z" />
-<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224z" />
-<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM64 512l256-224-256-224z" />
-<glyph unicode="&#xe030;" glyph-name="rtl" d="M256 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM960 64l-256 224 256 224z" />
-<glyph unicode="&#xe031;" glyph-name="copy" d="M832 704h-192v64l-192 192h-448v-768h384v-256h640v576l-192 192zM832 613.49l101.49-101.49h-101.49v101.49zM448 869.49l101.49-101.49h-101.49v101.49zM64 896h320v-192h192v-448h-512v640zM960 0h-512v192h192v448h128v-192h192v-448z" />
-<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
-<glyph unicode="&#xe033;" glyph-name="checkbox" d="M128 416l288-288 480 480-128 128-352-352-160 160z" />
-<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM904.34 256h74.86l44.8 448h-1024l64-640h484.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM1002.996 46.25l-198.496 174.692c17.454 28.92 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l174.692-198.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM640 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
-<glyph unicode="&#xe035;" glyph-name="pastetext" d="M512 448v-128h32l32 64h64v-256h-48v-64h224v64h-48v256h64l32-64h32v128zM832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h640v704h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM960 0h-512v576h512v-576z" />
-<glyph unicode="&#xe600;" glyph-name="gamma" d="M483.2 320l-147.2 336c-9.6 25.6-19.2 44.8-25.6 54.4s-16 12.8-25.6 12.8c-16 0-25.6-3.2-28.8-3.2v70.4c9.6 6.4 25.6 6.4 38.4 9.6 32 0 57.6-6.4 73.6-22.4 6.4-6.4 12.8-16 19.2-25.6 6.4-12.8 12.8-25.6 16-41.6l121.6-291.2 150.4 371.2h92.8l-198.4-470.4v-224h-86.4v224zM0 960v-1024h1024v1024h-1024zM960 0h-896v896h896v-896z" />
-<glyph unicode="&#xe601;" glyph-name="orientation" d="M627.2 80h-579.2v396.8h579.2v-396.8zM553.6 406.4h-435.2v-256h435.2v256zM259.2 732.8c176 176 457.6 176 633.6 0s176-457.6 0-633.6c-121.6-121.6-297.6-160-454.4-108.8 121.6-28.8 262.4 9.6 361.6 108.8 150.4 150.4 160 384 22.4 521.6-121.6 121.6-320 128-470.4 19.2l86.4-86.4-294.4-22.4 22.4 294.4 92.8-92.8z" />
-<glyph unicode="&#xe602;" glyph-name="invert" d="M892.8-22.4l-89.6 89.6c-70.4-80-172.8-131.2-288-131.2-208 0-380.8 166.4-384 377.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4v0c0 0 0 0 0 3.2 0 0 0 3.2 0 3.2 3.2 105.6 48 211.2 105.6 304l-192 192 44.8 44.8 182.4-182.4c0 0 0 0 0 0l569.6-569.6c0 0 0 0 0 0l99.2-99.2-48-44.8zM896 326.4c0 0 0 0 0 0 0 3.2 0 6.4 0 6.4-9.6 316.8-384 627.2-384 627.2s-108.8-89.6-208-220.8l70.4-70.4c6.4 9.6 16 22.4 22.4 32 41.6 51.2 83.2 96 115.2 128v0c32-32 73.6-76.8 115.2-128 108.8-137.6 169.6-265.6 172.8-371.2 0 0 0-3.2 0-3.2v0 0c0-3.2 0-3.2 0-6.4s0-3.2 0-3.2v0 0c0-22.4-3.2-41.6-9.6-64l76.8-76.8c16 41.6 28.8 89.6 28.8 137.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4z" />
-<glyph unicode="&#xe603;" glyph-name="codesample" d="M199.995 578.002v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-100.518 0-182.003-81.485-182.003-182.003v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-100.515 81.485-182.003 182.003-182.003h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 50.931-20.928 96.966-54.646 130.002 33.716 33.036 54.646 79.072 54.646 130.002zM824.005 578.002v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c100.515 0 182.003-81.485 182.003-182.003v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-100.515-81.488-182.003-182.003-182.003h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 50.931 20.928 96.966 54.646 130.002-33.716 33.036-54.646 79.072-54.646 130.002zM616.002 603.285c0-57.439-46.562-104.002-104.002-104.002s-104.002 46.562-104.002 104.002c0 57.439 46.562 104.002 104.002 104.002s104.002-46.562 104.002-104.002zM512 448.717c-57.439 0-104.002-46.562-104.002-104.002 0-55.845 26-100.115 105.752-103.88-23.719-33.417-59.441-46.612-105.752-50.944v-61.751c0 0 208.003-18.144 208.003 216.577-0.202 57.441-46.56 104.004-104.002 104.004z" />
-<glyph unicode="&#xe604;" glyph-name="tablerowprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe605;" glyph-name="tablecellprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
-<glyph unicode="&#xe606;" glyph-name="table2" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-896v192h896v-192z" />
-<glyph unicode="&#xe607;" glyph-name="tablemergecells" d="M0 896v-896h1024v896h-1024zM384 64v448h576v-448h-576zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192z" />
-<glyph unicode="&#xe608;" glyph-name="tableinsertcolbefore" d="M320 188.8v182.4h-182.4v89.6h182.4v182.4h86.4v-182.4h185.6v-89.6h-185.6v-182.4zM0 896v-896h1024v896h-1024zM640 64h-576v704h576v-704zM960 64h-256v192h256v-192zM960 320h-256v192h256v-192zM960 576h-256v192h256v-192z" />
-<glyph unicode="&#xe609;" glyph-name="tableinsertcolafter" d="M704 643.2v-182.4h182.4v-89.6h-182.4v-182.4h-86.4v182.4h-185.6v89.6h185.6v182.4zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v704h576v-704z" />
-<glyph unicode="&#xe60a;" glyph-name="tableinsertrowbefore" d="M691.2 508.8h-144v-144h-70.4v144h-144v67.2h144v144h70.4v-144h144zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM640 64h-256v192h256v-192zM960 64h-256v192h256v-192zM960 316.8h-896v451.2h896v-451.2z" />
-<glyph unicode="&#xe60b;" glyph-name="tableinsertrowafter" d="M332.8 323.2h144v144h70.4v-144h144v-67.2h-144v-144h-70.4v144h-144zM0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM64 768h256v-192h-256v192zM960 64h-896v451.2h896v-451.2zM960 576h-256v192h256v-192z" />
-<glyph unicode="&#xe60d;" glyph-name="tablesplitcells" d="M0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v448h576v-448zM960 576h-256v192h256v-192zM864 156.8l-60.8-60.8-131.2 131.2-131.2-131.2-60.8 60.8 131.2 131.2-131.2 131.2 60.8 60.8 131.2-131.2 131.2 131.2 60.8-60.8-131.2-131.2z" />
-<glyph unicode="&#xe60e;" glyph-name="tabledelete" d="M0 896h1024v-896h-1024v896zM60.8 768v-704h899.2v704h-899.2zM809.6 211.2l-96-96-204.8 204.8-204.8-204.8-96 96 204.8 204.8-204.8 204.8 96 96 204.8-204.8 204.8 204.8 96-96-204.8-204.8z" />
-<glyph unicode="&#xe62a;" glyph-name="tableleftheader" d="M0 896v-832h1024v832h-1024zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM640 640h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-256v192h256v-192z" />
-<glyph unicode="&#xe62b;" glyph-name="tabletopheader" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192z" />
-<glyph unicode="&#xe800;" glyph-name="tabledeleterow" d="M886.4 572.8l-156.8-156.8 160-160-76.8-76.8-160 160-156.8-156.8-76.8 73.6 160 160-163.2 163.2 76.8 76.8 163.2-163.2 156.8 156.8 73.6-76.8zM0 896v-896h1024v896h-1024zM960 576h-22.4l-64-64h86.4v-192h-89.6l64-64h25.6v-192h-896v192h310.4l64 64h-374.4v192h371.2l-64 64h-307.2v192h896v-192z" />
-<glyph unicode="&#xe801;" glyph-name="tabledeletecol" d="M320 499.2l64-64v-12.8l-64-64v140.8zM640 422.4l64-64v137.6l-64-64v-9.6zM1024 896v-896h-1024v896h1024zM960 768h-256v-51.2l-12.8 12.8-51.2-51.2v89.6h-256v-89.6l-51.2 51.2-12.8-12.8v51.2h-256v-704h256v118.4l35.2-35.2 28.8 28.8v-115.2h256v115.2l48-48 16 16v-83.2h256v707.2zM672 662.4l-156.8-156.8-163.2 163.2-76.8-76.8 163.2-163.2-156.8-156.8 76.8-76.8 156.8 156.8 160-160 76.8 76.8-160 160 156.8 156.8-76.8 76.8z" />
-<glyph unicode="&#xe900;" glyph-name="a11y" d="M960 704v64l-448-128-448 128v-64l320-128v-256l-128-448h64l192 448 192-448h64l-128 448v256zM416 800q0 40 28 68t68 28 68-28 28-68-28-68-68-28-68 28-28 68z" />
-<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM0 512h128v-128h-128v128zM192 512h832v-128h-832v128zM0 128h128v-128h-128v128zM192 128h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM192 320h128v-128h-128v128zM384 320h640v-128h-640v128z" />
-<glyph unicode="&#xe902;" glyph-name="fill" d="M521.6 915.2l-67.2-67.2-86.4 86.4-86.4-86.4 86.4-86.4-368-368 432-432 518.4 518.4-428.8 435.2zM435.2 134.4l-262.4 262.4 35.2 35.2 576 51.2-348.8-348.8zM953.6 409.6c-6.4-6.4-16-16-28.8-32-28.8-32-41.6-64-41.6-89.6v0 0 0 0 0 0 0c0-16 6.4-35.2 22.4-48 12.8-12.8 32-22.4 48-22.4s35.2 6.4 48 22.4 22.4 32 22.4 48v0 0 0 0 0 0 0c0 25.6-12.8 54.4-41.6 89.6-9.6 16-22.4 25.6-28.8 32v0z" />
-<glyph unicode="&#xe903;" glyph-name="borderwidth" d="M0 265.6h1024v-128h-1024v128zM0 32h1024v-64h-1024v64zM0 566.4h1024v-192h-1024v192zM0 928h1024v-256h-1024v256z" />
-<glyph unicode="&#xe904;" glyph-name="line" d="M739.2 627.2l-502.4-502.4h-185.6v185.6l502.4 502.4 185.6-185.6zM803.2 688l-185.6 185.6 67.2 67.2c22.4 22.4 54.4 22.4 76.8 0l108.8-108.8c22.4-22.4 22.4-54.4 0-76.8l-67.2-67.2zM41.6 48h940.8v-112h-940.8v112z" />
-<glyph unicode="&#xe905;" glyph-name="count" d="M0 480h1024v-64h-1024v64zM304 912v-339.2h-67.2v272h-67.2v67.2zM444.8 694.4v-54.4h134.4v-67.2h-201.6v153.6l134.4 64v54.4h-134.4v67.2h201.6v-153.6zM854.4 912v-339.2h-204.8v67.2h137.6v67.2h-137.6v70.4h137.6v67.2h-137.6v67.2zM115.2 166.4c3.2 57.6 38.4 83.2 108.8 83.2 38.4 0 67.2-9.6 86.4-25.6s25.6-35.2 25.6-70.4v-112c0-25.6 0-28.8 9.6-41.6h-73.6c-3.2 9.6-3.2 9.6-6.4 19.2-22.4-19.2-41.6-25.6-70.4-25.6-54.4 0-89.6 32-89.6 76.8s28.8 70.4 99.2 80l38.4 6.4c16 3.2 22.4 6.4 22.4 16 0 12.8-12.8 22.4-38.4 22.4s-41.6-9.6-44.8-28.8h-67.2zM262.4 115.2c-6.4-3.2-12.8-6.4-25.6-6.4l-25.6-6.4c-25.6-6.4-38.4-16-38.4-28.8 0-16 12.8-25.6 35.2-25.6s41.6 9.6 54.4 32v35.2zM390.4 336h73.6v-112c22.4 16 41.6 22.4 67.2 22.4 64 0 105.6-51.2 105.6-124.8 0-76.8-44.8-134.4-108.8-134.4-32 0-48 9.6-67.2 35.2v-28.8h-70.4v342.4zM460.8 121.6c0-41.6 22.4-70.4 51.2-70.4s51.2 28.8 51.2 70.4c0 44.8-19.2 70.4-51.2 70.4-28.8 0-51.2-28.8-51.2-70.4zM851.2 153.6c-3.2 22.4-19.2 35.2-44.8 35.2-32 0-51.2-25.6-51.2-70.4 0-48 19.2-73.6 51.2-73.6 25.6 0 41.6 12.8 44.8 41.6l70.4-3.2c-9.6-60.8-54.4-96-118.4-96-73.6 0-121.6 51.2-121.6 128 0 80 48 131.2 124.8 131.2 64 0 108.8-35.2 112-96h-67.2z" />
-<glyph unicode="&#xe906;" glyph-name="reload" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
-<glyph unicode="&#xe907;" glyph-name="translate" d="M553.6 304l-118.4 118.4c80 89.6 137.6 195.2 172.8 304h137.6v92.8h-326.4v92.8h-92.8v-92.8h-326.4v-92.8h518.4c-32-89.6-80-176-147.2-249.6-44.8 48-80 99.2-108.8 156.8h-92.8c35.2-76.8 80-147.2 137.6-211.2l-236.8-233.6 67.2-67.2 233.6 233.6 144-144c3.2 0 38.4 92.8 38.4 92.8zM816 540.8h-92.8l-208-560h92.8l51.2 140.8h220.8l51.2-140.8h92.8l-208 560zM691.2 214.4l76.8 201.6 76.8-201.6h-153.6z" />
-<glyph unicode="&#xe908;" glyph-name="drag" d="M576 896h128v-128h-128v128zM576 640h128v-128h-128v128zM320 640h128v-128h-128v128zM576 384h128v-128h-128v128zM320 384h128v-128h-128v128zM320 128h128v-128h-128v128zM576 128h128v-128h-128v128zM320 896h128v-128h-128v128z" />
-<glyph unicode="&#xe90b;" glyph-name="home" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
-<glyph unicode="&#xe911;" glyph-name="books" d="M576.234 670.73l242.712 81.432 203.584-606.784-242.712-81.432zM0 64h256v704h-256v-704zM64 640h128v-64h-128v64zM320 64h256v704h-256v-704zM384 640h128v-64h-128v64z" />
-<glyph unicode="&#xe914;" glyph-name="upload" d="M839.432 760.57c27.492-27.492 50.554-78.672 55.552-120.57h-318.984v318.984c41.898-4.998 93.076-28.060 120.568-55.552l142.864-142.862zM512 576v384h-368c-44 0-80-36-80-80v-864c0-44 36-80 80-80h672c44 0 80 36 80 80v560h-384zM576 192v-192h-192v192h-160l256 256 256-256h-160z" />
-<glyph unicode="&#xe915;" glyph-name="editimage" d="M768 416v-352h-640v640h352l128 128h-512c-52.8 0-96-43.2-96-96v-704c0-52.8 43.2-96 96-96h704c52.798 0 96 43.2 96 96v512l-128-128zM864 960l-608-608v-160h160l608 608c0 96-64 160-160 160zM416 320l-48 48 480 480 48-48-480-480z" />
-<glyph unicode="&#xe91c;" glyph-name="bubble" d="M928 896h-832c-52.8 0-96-43.2-96-96v-512c0-52.8 43.2-96 96-96h160v-256l307.2 256h364.8c52.8 0 96 43.2 96 96v512c0 52.8-43.2 96-96 96zM896 320h-379.142l-196.858-174.714v174.714h-192v448h768v-448z" />
-<glyph unicode="&#xe91d;" glyph-name="user" d="M622.826 257.264c-22.11 3.518-22.614 64.314-22.614 64.314s64.968 64.316 79.128 150.802c38.090 0 61.618 91.946 23.522 124.296 1.59 34.054 48.96 267.324-190.862 267.324s-192.45-233.27-190.864-267.324c-38.094-32.35-14.57-124.296 23.522-124.296 14.158-86.486 79.128-150.802 79.128-150.802s-0.504-60.796-22.614-64.314c-71.22-11.332-337.172-128.634-337.172-257.264h896c0 128.63-265.952 245.932-337.174 257.264z" />
-<glyph unicode="&#xe926;" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
-<glyph unicode="&#xe927;" glyph-name="unlock" d="M768 896c105.87 0 192-86.13 192-192v-192h-128v192c0 35.29-28.71 64-64 64h-128c-35.29 0-64-28.71-64-64v-192h16c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-544c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h400v192c0 105.87 86.13 192 192 192h128z" />
-<glyph unicode="&#xe928;" glyph-name="settings" d="M448 832v16c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576zM256 704v128h128v-128h-128zM832 528c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-576v-128h576v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h192v128h-192v16zM640 384v128h128v-128h-128zM448 208c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576v16zM256 64v128h128v-128h-128z" />
-<glyph unicode="&#xe92a;" glyph-name="remove2" d="M192-64h640l64 704h-768zM640 832v128h-256v-128h-320v-192l64 64h768l64-64v192h-320zM576 832h-128v64h128v-64z" />
-<glyph unicode="&#xe92d;" glyph-name="menu" d="M384 896h256v-256h-256zM384 576h256v-256h-256zM384 256h256v-256h-256z" />
-<glyph unicode="&#xe930;" glyph-name="warning" d="M1009.956 44.24l-437.074 871.112c-16.742 29.766-38.812 44.648-60.882 44.648s-44.14-14.882-60.884-44.648l-437.074-871.112c-33.486-59.532-5-108.24 63.304-108.24h869.308c68.302 0 96.792 48.708 63.302 108.24zM512 64c-35.346 0-64 28.654-64 64 0 35.348 28.654 64 64 64 35.348 0 64-28.652 64-64 0-35.346-28.652-64-64-64zM556 256h-88l-20 256c0 35.346 28.654 64 64 64s64-28.654 64-64l-20-256z" />
-<glyph unicode="&#xe931;" glyph-name="question" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
-<glyph unicode="&#xe932;" glyph-name="pluscircle" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 64c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384s-171.922-384-384-384zM768 384h-192v-192h-128v192h-192v128h192v192h128v-192h192z" />
-<glyph unicode="&#xe933;" glyph-name="info" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM448 768h128v-128h-128v128zM640 128h-256v64h64v256h-64v64h192v-320h64v-64z" />
-<glyph unicode="&#xe934;" glyph-name="notice" d="M1024 224l-288 736h-448l-288-288v-448l288-288h448l288 288v448l-288 288zM576 128h-128v128h128v-128zM576 384h-128v384h128v-384z" />
-<glyph unicode="&#xe935;" glyph-name="drop" d="M864.626 486.838c-65.754 183.44-205.11 348.15-352.626 473.162-147.516-125.012-286.87-289.722-352.626-473.162-40.664-113.436-44.682-236.562 12.584-345.4 65.846-125.14 198.632-205.438 340.042-205.438s274.196 80.298 340.040 205.44c57.27 108.838 53.25 231.962 12.586 345.398zM738.764 201.044c-43.802-83.252-132.812-137.044-226.764-137.044-55.12 0-108.524 18.536-152.112 50.652 13.242-1.724 26.632-2.652 40.112-2.652 117.426 0 228.668 67.214 283.402 171.242 44.878 85.292 40.978 173.848 23.882 244.338 14.558-28.15 26.906-56.198 36.848-83.932 22.606-63.062 40.024-156.34-5.368-242.604z" />
-<glyph unicode="&#xe939;" glyph-name="minus" d="M0 544v-192c0-17.672 14.328-32 32-32h960c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32h-960c-17.672 0-32-14.328-32-32z" />
-<glyph unicode="&#xe93a;" glyph-name="plus" d="M992 576h-352v352c0 17.672-14.328 32-32 32h-192c-17.672 0-32-14.328-32-32v-352h-352c-17.672 0-32-14.328-32-32v-192c0-17.672 14.328-32 32-32h352v-352c0-17.672 14.328-32 32-32h192c17.672 0 32 14.328 32 32v352h352c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32z" />
-<glyph unicode="&#xe93b;" glyph-name="arrowup" d="M0 320l192-192 320 320 320-320 192 192-511.998 512z" />
-<glyph unicode="&#xe93c;" glyph-name="arrowright" d="M384 960l-192-192 320-320-320-320 192-192 512 512z" />
-<glyph unicode="&#xe93d;" glyph-name="arrowdown" d="M1024 576l-192 192-320-320-320 320-192-192 512-511.998z" />
-<glyph unicode="&#xe93f;" glyph-name="arrowup2" d="M768 320l-256 256-256-256z" />
-<glyph unicode="&#xe940;" glyph-name="arrowdown2" d="M256 576l256-256 256 256z" />
-<glyph unicode="&#xe941;" glyph-name="menu2" d="M256 704l256-256 256 256zM255.996 384.004l256-256 256 256z" />
-<glyph unicode="&#xe961;" glyph-name="newtab" d="M704 384l128 128v-512h-768v768h512l-128-128h-256v-512h512zM960 896v-352l-130.744 130.744-354.746-354.744h-90.51v90.512l354.744 354.744-130.744 130.744z" />
-<glyph unicode="&#xeaa8;" glyph-name="rotateleft" d="M607.998 831.986c-212.070 0-383.986-171.916-383.986-383.986h-191.994l246.848-246.848 246.848 246.848h-191.994c0 151.478 122.798 274.276 274.276 274.276 151.48 0 274.276-122.798 274.276-274.276 0-151.48-122.796-274.276-274.276-274.276v-109.71c212.070 0 383.986 171.916 383.986 383.986s-171.916 383.986-383.986 383.986z" />
-<glyph unicode="&#xeaa9;" glyph-name="rotateright" d="M416.002 831.986c212.070 0 383.986-171.916 383.986-383.986h191.994l-246.848-246.848-246.848 246.848h191.994c0 151.478-122.798 274.276-274.276 274.276-151.48 0-274.276-122.798-274.276-274.276 0-151.48 122.796-274.276 274.276-274.276v-109.71c-212.070 0-383.986 171.916-383.986 383.986s171.916 383.986 383.986 383.986z" />
-<glyph unicode="&#xeaaa;" glyph-name="flipv" d="M0 576h1024v384zM1024 0v384h-1024z" />
-<glyph unicode="&#xeaac;" glyph-name="fliph" d="M576 960v-1024h384zM0-64h384v1024z" />
-<glyph unicode="&#xeb35;" glyph-name="zoomin" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM448 768h-128v-128h-128v-128h128v-128h128v128h128v128h-128z" />
-<glyph unicode="&#xeb36;" glyph-name="zoomout" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM192 640h384v-128h-384z" />
-<glyph unicode="&#xeba7;" glyph-name="sharpen" d="M768 832h-512l-256-256 512-576 512 576-256 256zM512 181.334v2.666h-2.37l-14.222 16h16.592v16h-30.814l-14.222 16h45.036v16h-59.258l-14.222 16h73.48v16h-87.704l-14.222 16h101.926v16h-116.148l-14.222 16h130.37v16h-144.592l-14.222 16h158.814v16h-173.038l-14.222 16h187.26v16h-201.482l-14.222 16h215.704v16h-229.926l-14.222 16h244.148v16h-258.372l-14.222 16h272.594v16h-286.816l-14.222 16h301.038v16h-315.26l-14.222 16h329.482v16h-343.706l-7.344 8.262 139.072 139.072h211.978v-3.334h215.314l16-16h-231.314v-16h247.314l16-16h-263.314v-16h279.314l16-16h-295.314v-16h311.314l16-16h-327.314v-16h343.312l7.738-7.738-351.050-394.928z" />
-<glyph unicode="&#xec6a;" glyph-name="options" d="M64 768h896v-192h-896zM64 512h896v-192h-896zM64 256h896v-192h-896z" />
-<glyph unicode="&#xeccc;" glyph-name="sun" d="M512 128c35.346 0 64-28.654 64-64v-64c0-35.346-28.654-64-64-64s-64 28.654-64 64v64c0 35.346 28.654 64 64 64zM512 768c-35.346 0-64 28.654-64 64v64c0 35.346 28.654 64 64 64s64-28.654 64-64v-64c0-35.346-28.654-64-64-64zM960 512c35.346 0 64-28.654 64-64s-28.654-64-64-64h-64c-35.348 0-64 28.654-64 64s28.652 64 64 64h64zM192 448c0-35.346-28.654-64-64-64h-64c-35.346 0-64 28.654-64 64s28.654 64 64 64h64c35.346 0 64-28.654 64-64zM828.784 221.726l45.256-45.258c24.992-24.99 24.992-65.516 0-90.508-24.994-24.992-65.518-24.992-90.51 0l-45.256 45.256c-24.992 24.99-24.992 65.516 0 90.51 24.994 24.992 65.518 24.992 90.51 0zM195.216 674.274l-45.256 45.256c-24.994 24.994-24.994 65.516 0 90.51s65.516 24.994 90.51 0l45.256-45.256c24.994-24.994 24.994-65.516 0-90.51s-65.516-24.994-90.51 0zM828.784 674.274c-24.992-24.992-65.516-24.992-90.51 0-24.992 24.994-24.992 65.516 0 90.51l45.256 45.254c24.992 24.994 65.516 24.994 90.51 0 24.992-24.994 24.992-65.516 0-90.51l-45.256-45.254zM195.216 221.726c24.992 24.992 65.518 24.992 90.508 0 24.994-24.994 24.994-65.52 0-90.51l-45.254-45.256c-24.994-24.992-65.516-24.992-90.51 0s-24.994 65.518 0 90.508l45.256 45.258zM512 704c-141.384 0-256-114.616-256-256 0-141.382 114.616-256 256-256 141.382 0 256 114.618 256 256 0 141.384-114.616 256-256 256zM512 288c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160-71.634-160-160-160z" />
-<glyph unicode="&#xeccd;" glyph-name="moon" d="M715.812 895.52c-60.25 34.784-124.618 55.904-189.572 64.48 122.936-160.082 144.768-384.762 37.574-570.42-107.2-185.67-312.688-279.112-512.788-252.68 39.898-51.958 90.376-97.146 150.628-131.934 245.908-141.974 560.37-57.72 702.344 188.198 141.988 245.924 57.732 560.372-188.186 702.356z" />
-<glyph unicode="&#xecd4;" glyph-name="contrast" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM128 448c0 212.078 171.922 384 384 384v-768c-212.078 0-384 171.922-384 384z" />
-<glyph unicode="&#xed6a;" glyph-name="remove22" d="M893.254 738.746l-90.508 90.508-290.746-290.744-290.746 290.744-90.508-90.506 290.746-290.748-290.746-290.746 90.508-90.508 290.746 290.746 290.746-290.746 90.508 90.51-290.744 290.744z" />
-<glyph unicode="&#xedc0;" glyph-name="arrowleft" d="M672-64l192 192-320 320 320 320-192 192-512-512z" />
-<glyph unicode="&#xedf9;" glyph-name="resize2" d="M0 896v-384c0-35.346 28.654-64 64-64s64 28.654 64 64v229.488l677.488-677.488h-229.488c-35.346 0-64-28.652-64-64 0-35.346 28.654-64 64-64h384c35.346 0 64 28.654 64 64v384c0 35.348-28.654 64-64 64s-64-28.652-64-64v-229.488l-677.488 677.488h229.488c35.346 0 64 28.654 64 64s-28.652 64-64 64h-384c-35.346 0-64-28.654-64-64z" />
-<glyph unicode="&#xee78;" glyph-name="crop" d="M832 704l192 192-64 64-192-192h-448v192h-128v-192h-192v-128h192v-512h512v-192h128v192h192v128h-192v448zM320 640h320l-320-320v320zM384 256l320 320v-320h-320z" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/fonts/tinymce.ttf b/public/tinymce/skins/lightgray/fonts/tinymce.ttf
deleted file mode 100644
index 61a48a511c224a81c89a7fb1d8101f9f16fbfd13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18644
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
J80A&3{|o!94>$k-

diff --git a/public/tinymce/skins/lightgray/fonts/tinymce.woff b/public/tinymce/skins/lightgray/fonts/tinymce.woff
deleted file mode 100644
index aace5d9c5c14e60c934cdb1a146fe468730eb4e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18720
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

diff --git a/public/tinymce/skins/lightgray/img/anchor.gif b/public/tinymce/skins/lightgray/img/anchor.gif
deleted file mode 100644
index 606348c7f53dba169a9aca7279a2a973f4b07bdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53
zcmZ?wbhEHbWM^P!XkcUjg8%>jEB<5wG8q|kKzxu40~1eAV&{y5e`l1KFoiKNSOWkz
C+YCGa

diff --git a/public/tinymce/skins/lightgray/img/loader.gif b/public/tinymce/skins/lightgray/img/loader.gif
deleted file mode 100644
index c69e937232b24ea30f01c68bbd2ebc798dcecfcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2608
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
T)6_**#cgp_+?JL9(ew3BlNF>u

diff --git a/public/tinymce/skins/lightgray/img/object.gif b/public/tinymce/skins/lightgray/img/object.gif
deleted file mode 100644
index cccd7f023fb80908cb33bb7d9604236cd21b7ae7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmV;J0B8S4Nk%w1VG#fg0J9GO<>lo+KR<78Z?v?uS65g4{r%Y3*xlXT%F4>`@9+2b
z_ww@cot>Tk|Nk>HGXMYpA^8LW000jFEC2ui01*HU000C<(8)=wd#<&tyXIMjHBV`d
zBSi|xsj3(;nD0kQ0aJq8eLH~x02P|t2!_J&Wqb%0io?#xD<upxn@Dup`7Ge3XH0HH
G0028|K14A9

diff --git a/public/tinymce/skins/lightgray/img/trans.gif b/public/tinymce/skins/lightgray/img/trans.gif
deleted file mode 100644
index 388486517fa8da13ebd150e8f65d5096c3e10c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
ncmZ?wbhEHbWMp7un7{x9ia%KxMSyG_5FaGNz{KRj$Y2csb)f_x

diff --git a/public/tinymce/skins/lightgray/skin.min.css b/public/tinymce/skins/lightgray/skin.min.css
deleted file mode 100644
index c0631ae8d6..0000000000
--- a/public/tinymce/skins/lightgray/skin.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#595959;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);box-shadow:0 1px 2px rgba(0, 0, 0, 0.2)}.mce-statusbar>.mce-container-body{display:flex;padding-right:16px}.mce-statusbar>.mce-container-body .mce-path{flex:1}.mce-wordcount{font-size:inherit;text-transform:uppercase;padding:8px 0}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative;font-size:11px}.mce-fullscreen .mce-resizehandle{display:none}.mce-statusbar .mce-flow-layout-item{margin:0}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:white}.mce-grid td.mce-grid-cell div{border:1px solid #c5c5c5;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#91bbe9}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#91bbe9}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#c5c5c5;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#91bbe9;background:#bdd6f2}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#8b8b8b}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-container b{font-weight:bold}.mce-container p{margin-bottom:5px}.mce-container a{cursor:pointer;color:#2276d2}.mce-container a:hover{text-decoration:underline}.mce-container ul{margin-left:15px}.mce-container .mce-table-striped{border-collapse:collapse;margin:10px}.mce-container .mce-table-striped thead>tr{background-color:#fafafa}.mce-container .mce-table-striped thead>tr th{font-weight:bold}.mce-container .mce-table-striped td,.mce-container .mce-table-striped th{padding:5px}.mce-container .mce-table-striped tr:nth-child(even){background-color:#fafafa}.mce-container .mce-table-striped tbody>tr:hover{background-color:#e1e1e1}.mce-branding{font-size:inherit;text-transform:uppercase;white-space:pre;padding:8px 0}.mce-branding a{font-size:inherit;color:inherit}.mce-top-part{position:relative}.mce-top-part::before{content:'';position:absolute;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);top:0;right:0;bottom:0;left:0;pointer-events:none}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-rtl .mce-statusbar>.mce-container-body>*:last-child{padding-right:0;padding-left:10px}.mce-rtl .mce-path{text-align:right;padding-right:16px}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.5;filter:alpha(opacity=50);zoom:1;position:absolute;background:black}.mce-croprect-handle:focus{border-color:#2276d2}.mce-croprect-handle-move:focus{outline:1px solid #2276d2}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel-bg{position:absolute;background:url('data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==')}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-arrow-up{margin-top:12px}.mce-arrow-down{margin-top:-12px}.mce-arrow:before,.mce-arrow:after{position:absolute;left:50%;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.mce-arrow.mce-arrow-up:before{top:-9px;border-bottom-color:#c5c5c5;border-width:0 9px 9px;margin-left:-9px}.mce-arrow.mce-arrow-down:before{bottom:-9px;border-top-color:#c5c5c5;border-width:9px 9px 0;margin-left:-9px}.mce-arrow.mce-arrow-up:after{top:-8px;border-bottom-color:#fff;border-width:0 8px 8px;margin-left:-8px}.mce-arrow.mce-arrow-down:after{bottom:-8px;border-top-color:#fff;border-width:8px 8px 0;margin-left:-8px}.mce-arrow.mce-arrow-left:before,.mce-arrow.mce-arrow-left:after{margin:0}.mce-arrow.mce-arrow-left:before{left:8px}.mce-arrow.mce-arrow-left:after{left:9px}.mce-arrow.mce-arrow-right:before,.mce-arrow.mce-arrow-right:after{left:auto;margin:0}.mce-arrow.mce-arrow-right:before{right:8px}.mce-arrow.mce-arrow-right:after{right:9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before{left:-9px;top:50%;border-right-color:#c5c5c5;border-width:9px 9px 9px 0;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:after{left:-8px;top:50%;border-right-color:#fff;border-width:8px 8px 8px 0;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left{margin-left:12px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before{right:-9px;top:50%;border-left-color:#c5c5c5;border-width:9px 0 9px 9px;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:after{right:-8px;top:50%;border-left-color:#fff;border-width:8px 0 8px 8px;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right{margin-left:-14px}.mce-edit-aria-container>.mce-container-body{display:flex}.mce-edit-aria-container>.mce-container-body .mce-edit-area{flex:1}.mce-edit-aria-container>.mce-container-body .mce-sidebar>.mce-container-body{display:flex;align-items:stretch;height:100%}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel{min-width:250px;max-width:250px;position:relative}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel>.mce-container-body{position:absolute;width:100%;height:100%;overflow:auto;top:0;left:0}.mce-sidebar-toolbar{border:0 solid #c5c5c5;border-left-width:1px}.mce-sidebar-toolbar .mce-btn{border-left:0;border-right:0}.mce-sidebar-toolbar .mce-btn.mce-active,.mce-sidebar-toolbar .mce-btn.mce-active:hover{background-color:#555c66}.mce-sidebar-toolbar .mce-btn.mce-active button,.mce-sidebar-toolbar .mce-btn.mce-active:hover button,.mce-sidebar-toolbar .mce-btn.mce-active button i,.mce-sidebar-toolbar .mce-btn.mce-active:hover button i{color:white;text-shadow:1px 1px none}.mce-sidebar-panel{border:0 solid #c5c5c5;border-left-width:1px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #f3f3f3;border:0 solid #c5c5c5;background-color:#fff}.mce-floatpanel{position:absolute;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);box-shadow:0 1px 2px rgba(0, 0, 0, 0.2)}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);top:0;left:0;background:#FFF;border:1px solid #c5c5c5;border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#c5c5c5;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#FFF}.mce-floatpanel.mce-popover.mce-top{margin-top:-10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-top>.mce-arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#c5c5c5;top:auto;bottom:-11px}.mce-floatpanel.mce-popover.mce-top>.mce-arrow:after{bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#FFF}.mce-floatpanel.mce-popover.mce-bottom.mce-start,.mce-floatpanel.mce-popover.mce-top.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow,.mce-floatpanel.mce-popover.mce-top.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end,.mce-floatpanel.mce-popover.mce-top.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow,.mce-floatpanel.mce-popover.mce-top.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#FFF}#mce-modal-block.mce-in{opacity:.5;filter:alpha(opacity=50);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;transform:scale(.1);transition:transform 100ms ease-in,opacity 150ms ease-in}.mce-window.mce-in{transform:scale(1);opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:0;top:0;height:38px;width:38px;text-align:center;cursor:pointer}.mce-window-head .mce-close i{color:#9b9b9b}.mce-close:hover i{color:#bdbdbd}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:20px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#FFF;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#e2e4e7}.mce-window .mce-btn:hover{border-color:#c5c5c5}.mce-window .mce-btn:focus{border-color:#2276d2}.mce-window-body .mce-btn,.mce-foot .mce-btn{border-color:#c5c5c5}.mce-foot .mce-btn.mce-primary{border-color:transparent}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:0}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right;padding-right:0;padding-left:20px}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1;margin-top:1px}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-ne,.mce-tooltip-se{margin-left:14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#595959}.mce-bar{display:block;width:0;height:100%;background-color:#dfdfdf;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#fff;padding:5px;margin-top:5px;border-width:1px;border-style:solid;border-color:#c5c5c5;transition:transform 100ms ease-in,opacity 150ms ease-in;opacity:0;box-sizing:border-box}.mce-notification.mce-in{opacity:1}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ECB}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto;display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#595959}.mce-notification .mce-progress .mce-bar-container{border-color:#c5c5c5}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#595959}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ECB}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#9b9b9b;cursor:pointer}.mce-abs-layout{position:relative}html .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b3b3b3;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);background:white;display:inline-block;*display:inline;*zoom:1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-btn:hover,.mce-btn:active{background:white;color:#595959;border-color:#e2e4e7}.mce-btn:focus{background:white;color:#595959;border-color:#e2e4e7}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover,.mce-btn.mce-active:focus,.mce-btn.mce-active:active{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background:#555c66;color:white;border-color:transparent}.mce-btn.mce-active button,.mce-btn.mce-active:hover button,.mce-btn.mce-active i,.mce-btn.mce-active:hover i{color:white}.mce-btn:hover .mce-caret{border-top-color:#b5bcc2}.mce-btn.mce-active .mce-caret,.mce-btn.mce-active:hover .mce-caret{border-top-color:white}.mce-btn button{padding:4px 6px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#595959;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary.mce-btn-has-text{min-width:50px}.mce-primary{color:white;border:1px solid transparent;border-color:transparent;background-color:#2276d2}.mce-primary:hover,.mce-primary:focus{background-color:#1e6abc;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#1e6abc;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-primary button,.mce-primary button i{color:white;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #b5bcc2;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #b5bcc2;border-top:0}.mce-btn-flat{border:0;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-toolbar .mce-btn-group{margin:0;padding:2px 0}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:0;margin-left:2px}.mce-btn-group{margin-left:2px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:white;text-indent:-10em;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#595959;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid #2276d2;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#bdbdbd}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{position:relative;display:inline-block;*display:inline;*zoom:1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#bdbdbd}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0;margin:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-combobox .mce-status{position:absolute;right:2px;top:50%;line-height:16px;margin-top:-8px;font-size:12px;width:15px;height:15px;text-align:center;cursor:pointer}.mce-combobox.mce-has-status input{padding-right:20px}.mce-combobox.mce-has-open .mce-status{right:37px}.mce-combobox .mce-status.mce-i-warning{color:#c09853}.mce-combobox .mce-status.mce-i-checkmark{color:#468847}.mce-menu.mce-combobox-menu{border-top:0;margin-top:0;max-height:200px}.mce-menu.mce-combobox-menu .mce-menu-item{padding:4px 6px 4px 4px;font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-sep{padding:0}.mce-menu.mce-combobox-menu .mce-text,.mce-menu.mce-combobox-menu .mce-text b{font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-link,.mce-menu.mce-combobox-menu .mce-menu-item-link b{font-size:11px}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid black;background:white;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal;font-size:inherit}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#595959;font-size:inherit;text-transform:uppercase}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#555c66;color:white}.mce-path .mce-divider{display:inline;font-size:inherit}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-infobox{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden;border:1px solid red}.mce-infobox div{display:block;margin:5px}.mce-infobox div button{position:absolute;top:50%;right:4px;cursor:pointer;margin-top:-8px;display:none}.mce-infobox div button:focus{outline:2px solid #e2e4e7}.mce-infobox.mce-has-help div{margin-right:25px}.mce-infobox.mce-has-help button{display:block}.mce-infobox.mce-success{background:#dff0d8;border-color:#d6e9c6}.mce-infobox.mce-success div{color:#3c763d}.mce-infobox.mce-warning{background:#fcf8e3;border-color:#faebcc}.mce-infobox.mce-warning div{color:#8a6d3b}.mce-infobox.mce-error{background:#f2dede;border-color:#ebccd1}.mce-infobox.mce-error div{color:#a94442}.mce-rtl .mce-infobox div{text-align:right;direction:rtl}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-success{color:#468847}.mce-label.mce-warning{color:#c09853}.mce-label.mce-error{color:#b94a48}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar{border:1px solid #e2e4e7}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar .mce-menubtn button span{color:#595959}.mce-menubar .mce-caret{border-top-color:#b5bcc2}.mce-menubar .mce-active .mce-caret,.mce-menubar .mce-menubtn:hover .mce-caret{border-top-color:#b5bcc2}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#e2e4e7;background:white;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-menubar .mce-menubtn.mce-active{border-bottom:none;z-index:65537}div.mce-menubtn.mce-opened{border-bottom-color:white;z-index:65537}.mce-menubtn button{color:#595959}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-rtl .mce-menubtn.mce-fixed-width span{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 4px 6px 4px;clear:both;font-weight:normal;line-height:20px;color:#595959;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-text,.mce-menu-item .mce-text b{line-height:1;vertical-align:initial}.mce-menu-item .mce-caret{margin-top:4px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #595959}.mce-menu-item .mce-menu-shortcut{display:inline-block;padding:0 10px 0 20px;color:#aaa}.mce-menu-item .mce-ico{padding-right:4px}.mce-menu-item:hover,.mce-menu-item:focus{background:#ededee}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#aaa}.mce-menu-item:hover .mce-text,.mce-menu-item:focus .mce-text,.mce-menu-item:hover .mce-ico,.mce-menu-item:focus .mce-ico{color:#595959}.mce-menu-item.mce-selected{background:#ededee}.mce-menu-item.mce-selected .mce-text,.mce-menu-item.mce-selected .mce-ico{color:#595959}.mce-menu-item.mce-active.mce-menu-item-normal{background:#555c66}.mce-menu-item.mce-active.mce-menu-item-normal .mce-text,.mce-menu-item.mce-active.mce-menu-item-normal .mce-ico{color:white}.mce-menu-item.mce-active.mce-menu-item-checkbox .mce-ico{visibility:visible}.mce-menu-item.mce-disabled,.mce-menu-item.mce-disabled:hover{background:white}.mce-menu-item.mce-disabled:focus,.mce-menu-item.mce-disabled:hover:focus{background:#ededee}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled:hover .mce-text,.mce-menu-item.mce-disabled .mce-ico,.mce-menu-item.mce-disabled:hover .mce-ico{color:#aaa}.mce-menu-item.mce-menu-item-preview.mce-active{border-left:5px solid #555c66;background:white}.mce-menu-item.mce-menu-item-preview.mce-active .mce-text,.mce-menu-item.mce-menu-item-preview.mce-active .mce-ico{color:#595959}.mce-menu-item.mce-menu-item-preview.mce-active:hover{background:#ededee}.mce-menu-item-link{color:#093;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mce-menu-item-link b{color:#093}.mce-menu-item-ellipsis{display:block;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.mce-menu-item:hover *,.mce-menu-item.mce-selected *,.mce-menu-item:focus *{color:#595959}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}div.mce-menu .mce-menu-item b{font-weight:bold}.mce-menu-item-indent-1{padding-left:20px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-3{padding-left:40px}.mce-menu-item-indent-4{padding-left:45px}.mce-menu-item-indent-5{padding-left:50px}.mce-menu-item-indent-6{padding-left:55px}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #595959;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#595959}.mce-rtl .mce-menu-item .mce-ico{padding-right:0;padding-left:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}.mce-menu .mce-throbber-inline{height:25px;background-size:contain}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:180px;background:white;border:1px solid #c5c9cf;border:1px solid #e2e4e7;z-index:1002;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);box-shadow:0 1px 2px rgba(0, 0, 0, 0.2);max-height:500px;overflow:auto;overflow-x:hidden}.mce-menu.mce-animate{opacity:.01;transform:rotateY(10deg) rotateX(-10deg);transform-origin:left top}.mce-menu.mce-menu-align .mce-menu-shortcut,.mce-menu.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block}.mce-menu.mce-in.mce-animate{opacity:1;transform:rotateY(0) rotateX(0);transition:opacity .075s ease,transform .1s ease}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-rtl .mce-menu-item .mce-ico{padding-right:0;padding-left:4px}.mce-rtl.mce-menu-align .mce-caret,.mce-rtl .mce-menu-shortcut{right:auto;left:0}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#595959}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #c5c5c5;background:#fff;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #c5c5c5;background:#e6e6e6;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-slider-handle:focus{border-color:#2276d2}.mce-spacer{visibility:hidden}.mce-splitbtn:hover .mce-open{border-left:1px solid #e2e4e7}.mce-splitbtn .mce-open{border-left:1px solid transparent;padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open:focus{border-left:1px solid #e2e4e7}.mce-splitbtn .mce-open:hover,.mce-splitbtn .mce-open:active{border-left:1px solid #e2e4e7}.mce-splitbtn.mce-active:hover .mce-open{border-left:1px solid white}.mce-splitbtn.mce-opened{border-color:#e2e4e7}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#fff}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#fff;padding:8px 15px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#FDFDFD}.mce-tab.mce-active{background:#FDFDFD;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-tab:focus{color:#2276d2}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#595959}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#2276d2;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#bdbdbd}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-dropzone{border:3px dashed gray;text-align:center}.mce-dropzone span{text-transform:uppercase;display:inline-block;vertical-align:middle}.mce-dropzone:after{content:"";height:100%;display:inline-block;vertical-align:middle}.mce-dropzone.mce-disabled{opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-dropzone.mce-disabled.mce-dragenter{cursor:not-allowed}.mce-browsebutton{position:relative;overflow:hidden}.mce-browsebutton button{position:relative;z-index:1}.mce-browsebutton input{opacity:0;filter:alpha(opacity=0);zoom:1;position:absolute;top:0;left:0;width:100%;height:100%;z-index:0}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-variant:normal;font-size:16px;line-height:16px;speak:none;vertical-align:text-top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;background:transparent center center;background-size:cover;width:16px;height:16px;color:#595959}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-alignnone:before{content:"\e003"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-insertdatetime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-rotateleft:before{content:"\eaa8"}.mce-i-rotateright:before{content:"\eaa9"}.mce-i-crop:before{content:"\ee78"}.mce-i-editimage:before{content:"\e915"}.mce-i-options:before{content:"\ec6a"}.mce-i-flipv:before{content:"\eaaa"}.mce-i-fliph:before{content:"\eaac"}.mce-i-zoomin:before{content:"\eb35"}.mce-i-zoomout:before{content:"\eb36"}.mce-i-sun:before{content:"\eccc"}.mce-i-moon:before{content:"\eccd"}.mce-i-arrowleft:before{content:"\edc0"}.mce-i-arrowright:before{content:"\e93c"}.mce-i-drop:before{content:"\e935"}.mce-i-contrast:before{content:"\ecd4"}.mce-i-sharpen:before{content:"\eba7"}.mce-i-resize2:before{content:"\edf9"}.mce-i-orientation:before{content:"\e601"}.mce-i-invert:before{content:"\e602"}.mce-i-gamma:before{content:"\e600"}.mce-i-remove:before{content:"\ed6a"}.mce-i-tablerowprops:before{content:"\e604"}.mce-i-tablecellprops:before{content:"\e605"}.mce-i-table2:before{content:"\e606"}.mce-i-tablemergecells:before{content:"\e607"}.mce-i-tableinsertcolbefore:before{content:"\e608"}.mce-i-tableinsertcolafter:before{content:"\e609"}.mce-i-tableinsertrowbefore:before{content:"\e60a"}.mce-i-tableinsertrowafter:before{content:"\e60b"}.mce-i-tablesplitcells:before{content:"\e60d"}.mce-i-tabledelete:before{content:"\e60e"}.mce-i-tableleftheader:before{content:"\e62a"}.mce-i-tabletopheader:before{content:"\e62b"}.mce-i-tabledeleterow:before{content:"\e800"}.mce-i-tabledeletecol:before{content:"\e801"}.mce-i-codesample:before{content:"\e603"}.mce-i-fill:before{content:"\e902"}.mce-i-borderwidth:before{content:"\e903"}.mce-i-line:before{content:"\e904"}.mce-i-count:before{content:"\e905"}.mce-i-translate:before{content:"\e907"}.mce-i-drag:before{content:"\e908"}.mce-i-home:before{content:"\e90b"}.mce-i-upload:before{content:"\e914"}.mce-i-bubble:before{content:"\e91c"}.mce-i-user:before{content:"\e91d"}.mce-i-lock:before{content:"\e926"}.mce-i-unlock:before{content:"\e927"}.mce-i-settings:before{content:"\e928"}.mce-i-remove2:before{content:"\e92a"}.mce-i-menu:before{content:"\e92d"}.mce-i-warning:before{content:"\e930"}.mce-i-question:before{content:"\e931"}.mce-i-pluscircle:before{content:"\e932"}.mce-i-info:before{content:"\e933"}.mce-i-notice:before{content:"\e934"}.mce-i-arrowup:before{content:"\e93b"}.mce-i-arrowdown:before{content:"\e93d"}.mce-i-arrowup2:before{content:"\e93f"}.mce-i-arrowdown2:before{content:"\e940"}.mce-i-menu2:before{content:"\e941"}.mce-i-newtab:before{content:"\e961"}.mce-i-a11y:before{content:"\e900"}.mce-i-plus:before{content:"\e93a"}.mce-i-insert:before{content:"\e93a"}.mce-i-minus:before{content:"\e939"}.mce-i-books:before{content:"\e911"}.mce-i-reload:before{content:"\e906"}.mce-i-toc:before{content:"\e901"}.mce-i-checkmark:before{content:"\e033"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-insert{font-size:14px}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}.mce-rtl .mce-filepicker input{direction:ltr}
\ No newline at end of file
diff --git a/public/tinymce/skins/lightgray/skin.mobile.min.css b/public/tinymce/skins/lightgray/skin.mobile.min.css
deleted file mode 100644
index 1b5490919d..0000000000
--- a/public/tinymce/skins/lightgray/skin.mobile.min.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.tinymce-mobile-outer-container{all:initial;display:block}.tinymce-mobile-outer-container *{-webkit-box-sizing:initial;box-sizing:initial;line-height:1;margin:0;padding:0;border:0;outline:0;text-shadow:none;float:none;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent}.tinymce-mobile-icon-arrow-back:before{content:"\e5cd"}.tinymce-mobile-icon-image:before{content:"\e412"}.tinymce-mobile-icon-cancel-circle:before{content:"\e5c9"}.tinymce-mobile-icon-full-dot:before{content:"\e061"}.tinymce-mobile-icon-align-center:before{content:"\e234"}.tinymce-mobile-icon-align-left:before{content:"\e236"}.tinymce-mobile-icon-align-right:before{content:"\e237"}.tinymce-mobile-icon-bold:before{content:"\e238"}.tinymce-mobile-icon-italic:before{content:"\e23f"}.tinymce-mobile-icon-unordered-list:before{content:"\e241"}.tinymce-mobile-icon-ordered-list:before{content:"\e242"}.tinymce-mobile-icon-font-size:before{content:"\e245"}.tinymce-mobile-icon-underline:before{content:"\e249"}.tinymce-mobile-icon-link:before{content:"\e157"}.tinymce-mobile-icon-unlink:before{content:"\eca2"}.tinymce-mobile-icon-color:before{content:"\e891"}.tinymce-mobile-icon-previous:before{content:"\e314"}.tinymce-mobile-icon-next:before{content:"\e315"}.tinymce-mobile-icon-large-font:before,.tinymce-mobile-icon-style-formats:before{content:"\e264"}.tinymce-mobile-icon-undo:before{content:"\e166"}.tinymce-mobile-icon-redo:before{content:"\e15a"}.tinymce-mobile-icon-removeformat:before{content:"\e239"}.tinymce-mobile-icon-small-font:before{content:"\e906"}.tinymce-mobile-icon-readonly-back:before,.tinymce-mobile-format-matches:after{content:"\e5ca"}.tinymce-mobile-icon-small-heading:before{content:"small"}.tinymce-mobile-icon-large-heading:before{content:"large"}.tinymce-mobile-icon-small-heading:before,.tinymce-mobile-icon-large-heading:before{font-family:sans-serif;font-size:80%}.tinymce-mobile-mask-edit-icon:before{content:"\e254"}.tinymce-mobile-icon-back:before{content:"\e5c4"}.tinymce-mobile-icon-heading:before{content:"Headings";font-family:sans-serif;font-weight:bold;font-size:80%}.tinymce-mobile-icon-h1:before{content:"H1";font-weight:bold}.tinymce-mobile-icon-h2:before{content:"H2";font-weight:bold}.tinymce-mobile-icon-h3:before{content:"H3";font-weight:bold}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;position:absolute;width:100%;height:100%;top:0;background:rgba(51,51,51,0.5)}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;-webkit-border-radius:50%;border-radius:50%;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-family:sans-serif;font-size:1em}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item{-webkit-border-radius:50%;border-radius:50%;width:2.1em;height:2.1em;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{font-size:1em;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}@media only screen and (min-device-width:700px){.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{font-size:1.2em}}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon{-webkit-border-radius:50%;border-radius:50%;width:2.1em;height:2.1em;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;color:#4682B4;background-color:white}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon:before{font-family:'tinymce-mobile';content:"\e900"}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon{z-index:2}.tinymce-mobile-android-container.tinymce-mobile-android-maximized{position:fixed;top:0;bottom:0;left:0;right:0;border:none;background:#fff;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized){position:relative}.tinymce-mobile-android-container .tinymce-mobile-editor-socket{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe{display:-webkit-box !important;display:-webkit-flex !important;display:-ms-flexbox !important;display:flex !important;height:auto !important;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.tinymce-mobile-android-scroll-reload{overflow:hidden}:not(.tinymce-mobile-readonly-mode)>.tinymce-mobile-android-selection-context-toolbar{margin-top:23px}.tinymce-mobile-toolstrip{background:#eceff1;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;z-index:1;-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;width:100%;height:2.5em;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#455a64}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type{background:#4682B4;color:#eceff1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group>div{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container{background:#f44336}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;margin-left:2px;margin-right:2px;height:80%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected{background:#455a64;color:#b1bec6}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;padding-top:.4em;padding-bottom:.4em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;overflow:hidden;position:relative;width:100%;min-height:1.5em;padding-left:0;padding-right:0}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain{-webkit-transition:left cubic-bezier(.4, 0, 1, 1) .15s;transition:left cubic-bezier(.4, 0, 1, 1) .15s;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input{font-family:Sans-serif}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x{position:absolute;right:0;color:#888;font-size:.6em;font-weight:bold;background:inherit;-webkit-border-radius:50%;border-radius:50%;border:none;-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;height:100%;padding-right:2px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x{display:none}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous:before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next:before{padding-left:.5em;padding-right:.5em;height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;font-weight:bold}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled:before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled:before{visibility:hidden}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item{margin:0 2px;font-size:10px;line-height:10px;padding-top:3px;color:#b1bec6}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active{color:#455a64}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;position:relative;padding:.28em 0;margin-left:10%;margin-right:10%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font:before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading:before{margin-right:.9em;margin-left:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font:before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading:before{margin-left:.9em;margin-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider{margin-left:0;margin-right:0}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;height:100%;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-top:.3em;margin-bottom:.3em;background:#b1bec6;height:.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container{padding-left:2em;padding-right:2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;height:100%;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-top:.3em;margin-bottom:.3em;background:-webkit-gradient(linear, left top, right top, color-stop(0, #f00), color-stop(17%, #ff0), color-stop(33%, #0f0), color-stop(50%, #0ff), color-stop(67%, #00f), color-stop(83%, #f0f), to(#f00));background:linear-gradient(to right, #f00 0, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%);height:.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black{background:black;width:1.2em;height:.2em;margin-top:.3em;margin-bottom:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white{background:white;width:1.2em;height:.2em;margin-top:.3em;margin-bottom:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb{position:absolute;height:.5em;width:.5em;left:-10px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:auto;top:0;bottom:0;-webkit-transition:border 120ms cubic-bezier(.39, .58, .57, 1);transition:border 120ms cubic-bezier(.39, .58, .57, 1);background-color:#455a64;background-clip:padding-box;color:#eceff1;border:.5em solid rgba(136,136,136,0);-webkit-border-radius:3em;border-radius:3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active{border:.5em solid rgba(136,136,136,0.39)}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group>div{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog){height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input{padding-top:.1em;padding-bottom:.1em;padding-left:5px;font-size:.85em;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;background:#fff;border:none;-webkit-border-radius:0;border-radius:0;color:#455a64}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder{color:#888}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input:-ms-input-placeholder{color:#888}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder{color:#888}.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}@media only screen and (orientation: landscape){.tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}}@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape){.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:150px}}.tinymce-mobile-dropup{background:white;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;overflow:hidden}.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking{-webkit-transition:height .3s ease-out;transition:height .3s ease-out}.tinymce-mobile-dropup.tinymce-mobile-dropup-growing{-webkit-transition:height .3s ease-in;transition:height .3s ease-in}.tinymce-mobile-dropup.tinymce-mobile-dropup-closed{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0}.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing){-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.tinymce-mobile-styles-menu{overflow:hidden;outline:4px solid black;position:relative;width:100%;font-family:sans-serif}.tinymce-mobile-styles-menu [role="menu"]{height:100%;position:absolute;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;width:100%}.tinymce-mobile-styles-menu [role="menu"].transitioning{-webkit-transition:-webkit-transform .5s ease-in-out;transition:-webkit-transform .5s ease-in-out;transition:transform .5s ease-in-out;transition:transform .5s ease-in-out, -webkit-transform .5s ease-in-out}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item{cursor:pointer;padding:1em 1em;position:relative;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;border-bottom:1px solid #ddd;color:#455a64}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon:before{font-family:'tinymce-mobile';content:"\e314";color:#455a64}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu:after{font-family:'tinymce-mobile';content:"\e315";position:absolute;padding-left:1em;padding-right:1em;right:0;color:#455a64}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches:after{font-family:'tinymce-mobile';position:absolute;padding-left:1em;padding-right:1em;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator,.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser{border-top:#455a64;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;min-height:2.5em;padding-left:1em;padding-right:1em;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;background:#eceff1;color:#455a64}.tinymce-mobile-styles-menu [data-transitioning-destination="before"][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state="before"]{-webkit-transform:translate(-100%);transform:translate(-100%)}.tinymce-mobile-styles-menu [data-transitioning-destination="current"][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state="current"]{-webkit-transform:translate(0);transform:translate(0)}.tinymce-mobile-styles-menu [data-transitioning-destination="after"][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state="after"]{-webkit-transform:translate(100%);transform:translate(100%)}@font-face{font-family:'tinymce-mobile';src:url('fonts/tinymce-mobile.woff?8x92w3') format('woff');font-weight:normal;font-style:normal}@media (min-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:25px}}@media (max-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:18px}}.tinymce-mobile-icon{font-family:'tinymce-mobile'}.mixin-flex-and-centre{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.mixin-flex-bar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket{overflow:hidden;height:300px}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip{display:none}.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{position:fixed;right:2em;bottom:1em;color:white;background-color:#4682B4;-webkit-border-radius:50%;border-radius:50%;width:2.1em;height:2.1em;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:1em}@media only screen and (min-device-width:700px){.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{font-size:1.2em}}input[type="file"]::-webkit-file-upload-button{display:none}@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape){.tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{bottom:50%}}
-/*# sourceMappingURL=skin.mobile.min.css.map */
\ No newline at end of file
diff --git a/public/tinymce/skins/oxide/content.css b/public/tinymce/skins/oxide/content.css
new file mode 100644
index 0000000000..2ac0ccaf53
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.css
@@ -0,0 +1,732 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.mce-content-body .mce-item-anchor {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  cursor: default;
+  display: inline-block;
+  height: 12px !important;
+  padding: 0 2px;
+  -webkit-user-modify: read-only;
+  -moz-user-modify: read-only;
+  -webkit-user-select: all;
+  -moz-user-select: all;
+  -ms-user-select: all;
+      user-select: all;
+  width: 8px !important;
+}
+.mce-content-body .mce-item-anchor[data-mce-selected] {
+  outline-offset: 1px;
+}
+.tox-comments-visible .tox-comment {
+  background-color: #fff0b7;
+}
+.tox-comments-visible .tox-comment--active {
+  background-color: #ffe168;
+}
+.tox-checklist > li:not(.tox-checklist--hidden) {
+  list-style: none;
+  margin: 0.25em 0;
+}
+.tox-checklist > li:not(.tox-checklist--hidden)::before {
+  content: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+  cursor: pointer;
+  height: 1em;
+  margin-left: -1.5em;
+  margin-top: 0.125em;
+  position: absolute;
+  width: 1em;
+}
+.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
+  content: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+}
+[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
+  margin-left: 0;
+  margin-right: -1.5em;
+}
+/* stylelint-disable */
+/* http://prismjs.com/ */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  font-size: 1em;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+  -moz-tab-size: 4;
+  tab-size: 4;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+@media print {
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: 0.5em 0;
+  overflow: auto;
+}
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+  padding: 0.1em;
+  border-radius: 0.3em;
+  white-space: normal;
+}
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+.token.punctuation {
+  color: #999;
+}
+.namespace {
+  opacity: 0.7;
+}
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, 0.5);
+}
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+.token.italic {
+  font-style: italic;
+}
+.token.entity {
+  cursor: help;
+}
+/* stylelint-enable */
+.mce-content-body {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+}
+.mce-content-body .mce-visual-caret {
+  background-color: black;
+  background-color: currentColor;
+  position: absolute;
+}
+.mce-content-body .mce-visual-caret-hidden {
+  display: none;
+}
+.mce-content-body *[data-mce-caret] {
+  left: -1000px;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  right: auto;
+  top: 0;
+}
+.mce-content-body .mce-offscreen-selection {
+  left: -2000000px;
+  max-width: 1000000px;
+  position: absolute;
+}
+.mce-content-body *[contentEditable=false] {
+  cursor: default;
+}
+.mce-content-body *[contentEditable=true] {
+  cursor: text;
+}
+.tox-cursor-format-painter {
+  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
+}
+.mce-content-body figure.align-left {
+  float: left;
+}
+.mce-content-body figure.align-right {
+  float: right;
+}
+.mce-content-body figure.image.align-center {
+  display: table;
+  margin-left: auto;
+  margin-right: auto;
+}
+.mce-preview-object {
+  border: 1px solid gray;
+  display: inline-block;
+  line-height: 0;
+  margin: 0 2px 0 2px;
+  position: relative;
+}
+.mce-preview-object .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-preview-object[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.mce-object {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  border: 1px dashed #aaa;
+}
+.mce-pagebreak {
+  border: 1px dashed #aaa;
+  cursor: default;
+  display: block;
+  height: 5px;
+  margin-top: 15px;
+  page-break-before: always;
+  width: 100%;
+}
+@media print {
+  .mce-pagebreak {
+    border: 0;
+  }
+}
+.tiny-pageembed .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.tiny-pageembed[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.tiny-pageembed {
+  display: inline-block;
+  position: relative;
+}
+.tiny-pageembed--21by9,
+.tiny-pageembed--16by9,
+.tiny-pageembed--4by3,
+.tiny-pageembed--1by1 {
+  display: block;
+  overflow: hidden;
+  padding: 0;
+  position: relative;
+  width: 100%;
+}
+.tiny-pageembed--21by9 {
+  padding-top: 42.857143%;
+}
+.tiny-pageembed--16by9 {
+  padding-top: 56.25%;
+}
+.tiny-pageembed--4by3 {
+  padding-top: 75%;
+}
+.tiny-pageembed--1by1 {
+  padding-top: 100%;
+}
+.tiny-pageembed--21by9 iframe,
+.tiny-pageembed--16by9 iframe,
+.tiny-pageembed--4by3 iframe,
+.tiny-pageembed--1by1 iframe {
+  border: 0;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-content-body[data-mce-placeholder] {
+  position: relative;
+}
+.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
+  color: rgba(34, 47, 62, 0.7);
+  content: attr(data-mce-placeholder);
+  position: absolute;
+}
+.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
+  left: 1px;
+}
+.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
+  right: 1px;
+}
+.mce-content-body div.mce-resizehandle {
+  background-color: #4099ff;
+  border-color: #4099ff;
+  border-style: solid;
+  border-width: 1px;
+  box-sizing: border-box;
+  height: 10px;
+  position: absolute;
+  width: 10px;
+  z-index: 1298;
+}
+.mce-content-body div.mce-resizehandle:hover {
+  background-color: #4099ff;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(1) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(2) {
+  cursor: nesw-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(3) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(4) {
+  cursor: nesw-resize;
+}
+.mce-content-body .mce-resize-backdrop {
+  z-index: 10000;
+}
+.mce-content-body .mce-clonedresizable {
+  cursor: default;
+  opacity: 0.5;
+  outline: 1px dashed black;
+  position: absolute;
+  z-index: 10001;
+}
+.mce-content-body .mce-clonedresizable.mce-resizetable-columns th,
+.mce-content-body .mce-clonedresizable.mce-resizetable-columns td {
+  border: 0;
+}
+.mce-content-body .mce-resize-helper {
+  background: #555;
+  background: rgba(0, 0, 0, 0.75);
+  border: 1px;
+  border-radius: 3px;
+  color: white;
+  display: none;
+  font-family: sans-serif;
+  font-size: 12px;
+  line-height: 14px;
+  margin: 5px 10px;
+  padding: 5px;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 10002;
+}
+.tox-rtc-user-selection {
+  position: relative;
+}
+.tox-rtc-user-cursor {
+  bottom: 0;
+  cursor: default;
+  position: absolute;
+  top: 0;
+  width: 2px;
+}
+.tox-rtc-user-cursor::before {
+  background-color: inherit;
+  border-radius: 50%;
+  content: '';
+  display: block;
+  height: 8px;
+  position: absolute;
+  right: -3px;
+  top: -3px;
+  width: 8px;
+}
+.tox-rtc-user-cursor:hover::after {
+  background-color: inherit;
+  border-radius: 100px;
+  box-sizing: border-box;
+  color: #fff;
+  content: attr(data-user);
+  display: block;
+  font-size: 12px;
+  font-weight: bold;
+  left: -5px;
+  min-height: 8px;
+  min-width: 8px;
+  padding: 0 12px;
+  position: absolute;
+  top: -11px;
+  white-space: nowrap;
+  z-index: 1000;
+}
+.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
+  background-color: #2dc26b;
+}
+.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
+  background-color: #e03e2d;
+}
+.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
+  background-color: #f1c40f;
+}
+.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
+  background-color: #3598db;
+}
+.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
+  background-color: #b96ad9;
+}
+.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
+  background-color: #e67e23;
+}
+.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
+  background-color: #aaa69d;
+}
+.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
+  background-color: #f368e0;
+}
+.tox-rtc-remote-image {
+  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
+  border: 1px solid #ccc;
+  min-height: 240px;
+  min-width: 320px;
+}
+.mce-match-marker {
+  background: #aaa;
+  color: #fff;
+}
+.mce-match-marker-selected {
+  background: #39f;
+  color: #fff;
+}
+.mce-match-marker-selected::-moz-selection {
+  background: #39f;
+  color: #fff;
+}
+.mce-match-marker-selected::selection {
+  background: #39f;
+  color: #fff;
+}
+.mce-content-body img[data-mce-selected],
+.mce-content-body video[data-mce-selected],
+.mce-content-body audio[data-mce-selected],
+.mce-content-body object[data-mce-selected],
+.mce-content-body embed[data-mce-selected],
+.mce-content-body table[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body hr[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+  outline-offset: 1px;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false][data-mce-selected] {
+  cursor: not-allowed;
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
+.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
+  outline: none;
+}
+.mce-content-body *[data-mce-selected="inline-boundary"] {
+  background-color: #b4d7ff;
+}
+.mce-content-body .mce-edit-focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body td[data-mce-selected],
+.mce-content-body th[data-mce-selected] {
+  position: relative;
+}
+.mce-content-body td[data-mce-selected]::-moz-selection,
+.mce-content-body th[data-mce-selected]::-moz-selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected]::selection,
+.mce-content-body th[data-mce-selected]::selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected] *,
+.mce-content-body th[data-mce-selected] * {
+  outline: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+.mce-content-body td[data-mce-selected]::after,
+.mce-content-body th[data-mce-selected]::after {
+  background-color: rgba(180, 215, 255, 0.7);
+  border: 1px solid rgba(180, 215, 255, 0.7);
+  bottom: -1px;
+  content: '';
+  left: -1px;
+  mix-blend-mode: multiply;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .mce-content-body td[data-mce-selected]::after,
+  .mce-content-body th[data-mce-selected]::after {
+    border-color: rgba(0, 84, 180, 0.7);
+  }
+}
+.mce-content-body img::-moz-selection {
+  background: none;
+}
+.mce-content-body img::selection {
+  background: none;
+}
+.ephox-snooker-resizer-bar {
+  background-color: #b4d7ff;
+  opacity: 0;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.ephox-snooker-resizer-cols {
+  cursor: col-resize;
+}
+.ephox-snooker-resizer-rows {
+  cursor: row-resize;
+}
+.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
+  opacity: 1;
+}
+.mce-spellchecker-word {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+  height: 2rem;
+}
+.mce-spellchecker-grammar {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+}
+.mce-toc {
+  border: 1px solid gray;
+}
+.mce-toc h2 {
+  margin: 4px;
+}
+.mce-toc li {
+  list-style-type: none;
+}
+table[style*="border-width: 0px"],
+.mce-item-table:not([border]),
+.mce-item-table[border="0"],
+table[style*="border-width: 0px"] td,
+.mce-item-table:not([border]) td,
+.mce-item-table[border="0"] td,
+table[style*="border-width: 0px"] th,
+.mce-item-table:not([border]) th,
+.mce-item-table[border="0"] th,
+table[style*="border-width: 0px"] caption,
+.mce-item-table:not([border]) caption,
+.mce-item-table[border="0"] caption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks p,
+.mce-visualblocks h1,
+.mce-visualblocks h2,
+.mce-visualblocks h3,
+.mce-visualblocks h4,
+.mce-visualblocks h5,
+.mce-visualblocks h6,
+.mce-visualblocks div:not([data-mce-bogus]),
+.mce-visualblocks section,
+.mce-visualblocks article,
+.mce-visualblocks blockquote,
+.mce-visualblocks address,
+.mce-visualblocks pre,
+.mce-visualblocks figure,
+.mce-visualblocks figcaption,
+.mce-visualblocks hgroup,
+.mce-visualblocks aside,
+.mce-visualblocks ul,
+.mce-visualblocks ol,
+.mce-visualblocks dl {
+  background-repeat: no-repeat;
+  border: 1px dashed #bbb;
+  margin-left: 3px;
+  padding-top: 10px;
+}
+.mce-visualblocks p {
+  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
+}
+.mce-visualblocks h1 {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
+}
+.mce-visualblocks h2 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
+}
+.mce-visualblocks h3 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
+}
+.mce-visualblocks h4 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
+}
+.mce-visualblocks h5 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
+}
+.mce-visualblocks h6 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
+}
+.mce-visualblocks div:not([data-mce-bogus]) {
+  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
+}
+.mce-visualblocks section {
+  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
+}
+.mce-visualblocks article {
+  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
+}
+.mce-visualblocks blockquote {
+  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
+}
+.mce-visualblocks address {
+  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
+}
+.mce-visualblocks pre {
+  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
+}
+.mce-visualblocks figure {
+  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
+}
+.mce-visualblocks figcaption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks hgroup {
+  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
+}
+.mce-visualblocks aside {
+  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
+}
+.mce-visualblocks ul {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
+}
+.mce-visualblocks ol {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
+}
+.mce-visualblocks dl {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
+}
+.mce-visualblocks:not([dir=rtl]) p,
+.mce-visualblocks:not([dir=rtl]) h1,
+.mce-visualblocks:not([dir=rtl]) h2,
+.mce-visualblocks:not([dir=rtl]) h3,
+.mce-visualblocks:not([dir=rtl]) h4,
+.mce-visualblocks:not([dir=rtl]) h5,
+.mce-visualblocks:not([dir=rtl]) h6,
+.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
+.mce-visualblocks:not([dir=rtl]) section,
+.mce-visualblocks:not([dir=rtl]) article,
+.mce-visualblocks:not([dir=rtl]) blockquote,
+.mce-visualblocks:not([dir=rtl]) address,
+.mce-visualblocks:not([dir=rtl]) pre,
+.mce-visualblocks:not([dir=rtl]) figure,
+.mce-visualblocks:not([dir=rtl]) figcaption,
+.mce-visualblocks:not([dir=rtl]) hgroup,
+.mce-visualblocks:not([dir=rtl]) aside,
+.mce-visualblocks:not([dir=rtl]) ul,
+.mce-visualblocks:not([dir=rtl]) ol,
+.mce-visualblocks:not([dir=rtl]) dl {
+  margin-left: 3px;
+}
+.mce-visualblocks[dir=rtl] p,
+.mce-visualblocks[dir=rtl] h1,
+.mce-visualblocks[dir=rtl] h2,
+.mce-visualblocks[dir=rtl] h3,
+.mce-visualblocks[dir=rtl] h4,
+.mce-visualblocks[dir=rtl] h5,
+.mce-visualblocks[dir=rtl] h6,
+.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
+.mce-visualblocks[dir=rtl] section,
+.mce-visualblocks[dir=rtl] article,
+.mce-visualblocks[dir=rtl] blockquote,
+.mce-visualblocks[dir=rtl] address,
+.mce-visualblocks[dir=rtl] pre,
+.mce-visualblocks[dir=rtl] figure,
+.mce-visualblocks[dir=rtl] figcaption,
+.mce-visualblocks[dir=rtl] hgroup,
+.mce-visualblocks[dir=rtl] aside,
+.mce-visualblocks[dir=rtl] ul,
+.mce-visualblocks[dir=rtl] ol,
+.mce-visualblocks[dir=rtl] dl {
+  background-position-x: right;
+  margin-right: 3px;
+}
+.mce-nbsp,
+.mce-shy {
+  background: #aaa;
+}
+.mce-shy::after {
+  content: '-';
+}
+body {
+  font-family: sans-serif;
+}
+table {
+  border-collapse: collapse;
+}
diff --git a/public/tinymce/skins/oxide/content.inline.css b/public/tinymce/skins/oxide/content.inline.css
new file mode 100644
index 0000000000..8e7521d9dd
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.inline.css
@@ -0,0 +1,726 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.mce-content-body .mce-item-anchor {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  cursor: default;
+  display: inline-block;
+  height: 12px !important;
+  padding: 0 2px;
+  -webkit-user-modify: read-only;
+  -moz-user-modify: read-only;
+  -webkit-user-select: all;
+  -moz-user-select: all;
+  -ms-user-select: all;
+      user-select: all;
+  width: 8px !important;
+}
+.mce-content-body .mce-item-anchor[data-mce-selected] {
+  outline-offset: 1px;
+}
+.tox-comments-visible .tox-comment {
+  background-color: #fff0b7;
+}
+.tox-comments-visible .tox-comment--active {
+  background-color: #ffe168;
+}
+.tox-checklist > li:not(.tox-checklist--hidden) {
+  list-style: none;
+  margin: 0.25em 0;
+}
+.tox-checklist > li:not(.tox-checklist--hidden)::before {
+  content: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+  cursor: pointer;
+  height: 1em;
+  margin-left: -1.5em;
+  margin-top: 0.125em;
+  position: absolute;
+  width: 1em;
+}
+.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
+  content: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
+}
+[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
+  margin-left: 0;
+  margin-right: -1.5em;
+}
+/* stylelint-disable */
+/* http://prismjs.com/ */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  font-size: 1em;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+  -moz-tab-size: 4;
+  tab-size: 4;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+@media print {
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: 0.5em 0;
+  overflow: auto;
+}
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+  padding: 0.1em;
+  border-radius: 0.3em;
+  white-space: normal;
+}
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+.token.punctuation {
+  color: #999;
+}
+.namespace {
+  opacity: 0.7;
+}
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, 0.5);
+}
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+.token.italic {
+  font-style: italic;
+}
+.token.entity {
+  cursor: help;
+}
+/* stylelint-enable */
+.mce-content-body {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+}
+.mce-content-body .mce-visual-caret {
+  background-color: black;
+  background-color: currentColor;
+  position: absolute;
+}
+.mce-content-body .mce-visual-caret-hidden {
+  display: none;
+}
+.mce-content-body *[data-mce-caret] {
+  left: -1000px;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  right: auto;
+  top: 0;
+}
+.mce-content-body .mce-offscreen-selection {
+  left: -2000000px;
+  max-width: 1000000px;
+  position: absolute;
+}
+.mce-content-body *[contentEditable=false] {
+  cursor: default;
+}
+.mce-content-body *[contentEditable=true] {
+  cursor: text;
+}
+.tox-cursor-format-painter {
+  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
+}
+.mce-content-body figure.align-left {
+  float: left;
+}
+.mce-content-body figure.align-right {
+  float: right;
+}
+.mce-content-body figure.image.align-center {
+  display: table;
+  margin-left: auto;
+  margin-right: auto;
+}
+.mce-preview-object {
+  border: 1px solid gray;
+  display: inline-block;
+  line-height: 0;
+  margin: 0 2px 0 2px;
+  position: relative;
+}
+.mce-preview-object .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-preview-object[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.mce-object {
+  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
+  border: 1px dashed #aaa;
+}
+.mce-pagebreak {
+  border: 1px dashed #aaa;
+  cursor: default;
+  display: block;
+  height: 5px;
+  margin-top: 15px;
+  page-break-before: always;
+  width: 100%;
+}
+@media print {
+  .mce-pagebreak {
+    border: 0;
+  }
+}
+.tiny-pageembed .mce-shim {
+  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.tiny-pageembed[data-mce-selected="2"] .mce-shim {
+  display: none;
+}
+.tiny-pageembed {
+  display: inline-block;
+  position: relative;
+}
+.tiny-pageembed--21by9,
+.tiny-pageembed--16by9,
+.tiny-pageembed--4by3,
+.tiny-pageembed--1by1 {
+  display: block;
+  overflow: hidden;
+  padding: 0;
+  position: relative;
+  width: 100%;
+}
+.tiny-pageembed--21by9 {
+  padding-top: 42.857143%;
+}
+.tiny-pageembed--16by9 {
+  padding-top: 56.25%;
+}
+.tiny-pageembed--4by3 {
+  padding-top: 75%;
+}
+.tiny-pageembed--1by1 {
+  padding-top: 100%;
+}
+.tiny-pageembed--21by9 iframe,
+.tiny-pageembed--16by9 iframe,
+.tiny-pageembed--4by3 iframe,
+.tiny-pageembed--1by1 iframe {
+  border: 0;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.mce-content-body[data-mce-placeholder] {
+  position: relative;
+}
+.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
+  color: rgba(34, 47, 62, 0.7);
+  content: attr(data-mce-placeholder);
+  position: absolute;
+}
+.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
+  left: 1px;
+}
+.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
+  right: 1px;
+}
+.mce-content-body div.mce-resizehandle {
+  background-color: #4099ff;
+  border-color: #4099ff;
+  border-style: solid;
+  border-width: 1px;
+  box-sizing: border-box;
+  height: 10px;
+  position: absolute;
+  width: 10px;
+  z-index: 1298;
+}
+.mce-content-body div.mce-resizehandle:hover {
+  background-color: #4099ff;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(1) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(2) {
+  cursor: nesw-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(3) {
+  cursor: nwse-resize;
+}
+.mce-content-body div.mce-resizehandle:nth-of-type(4) {
+  cursor: nesw-resize;
+}
+.mce-content-body .mce-resize-backdrop {
+  z-index: 10000;
+}
+.mce-content-body .mce-clonedresizable {
+  cursor: default;
+  opacity: 0.5;
+  outline: 1px dashed black;
+  position: absolute;
+  z-index: 10001;
+}
+.mce-content-body .mce-clonedresizable.mce-resizetable-columns th,
+.mce-content-body .mce-clonedresizable.mce-resizetable-columns td {
+  border: 0;
+}
+.mce-content-body .mce-resize-helper {
+  background: #555;
+  background: rgba(0, 0, 0, 0.75);
+  border: 1px;
+  border-radius: 3px;
+  color: white;
+  display: none;
+  font-family: sans-serif;
+  font-size: 12px;
+  line-height: 14px;
+  margin: 5px 10px;
+  padding: 5px;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 10002;
+}
+.tox-rtc-user-selection {
+  position: relative;
+}
+.tox-rtc-user-cursor {
+  bottom: 0;
+  cursor: default;
+  position: absolute;
+  top: 0;
+  width: 2px;
+}
+.tox-rtc-user-cursor::before {
+  background-color: inherit;
+  border-radius: 50%;
+  content: '';
+  display: block;
+  height: 8px;
+  position: absolute;
+  right: -3px;
+  top: -3px;
+  width: 8px;
+}
+.tox-rtc-user-cursor:hover::after {
+  background-color: inherit;
+  border-radius: 100px;
+  box-sizing: border-box;
+  color: #fff;
+  content: attr(data-user);
+  display: block;
+  font-size: 12px;
+  font-weight: bold;
+  left: -5px;
+  min-height: 8px;
+  min-width: 8px;
+  padding: 0 12px;
+  position: absolute;
+  top: -11px;
+  white-space: nowrap;
+  z-index: 1000;
+}
+.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
+  background-color: #2dc26b;
+}
+.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
+  background-color: #e03e2d;
+}
+.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
+  background-color: #f1c40f;
+}
+.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
+  background-color: #3598db;
+}
+.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
+  background-color: #b96ad9;
+}
+.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
+  background-color: #e67e23;
+}
+.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
+  background-color: #aaa69d;
+}
+.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
+  background-color: #f368e0;
+}
+.tox-rtc-remote-image {
+  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
+  border: 1px solid #ccc;
+  min-height: 240px;
+  min-width: 320px;
+}
+.mce-match-marker {
+  background: #aaa;
+  color: #fff;
+}
+.mce-match-marker-selected {
+  background: #39f;
+  color: #fff;
+}
+.mce-match-marker-selected::-moz-selection {
+  background: #39f;
+  color: #fff;
+}
+.mce-match-marker-selected::selection {
+  background: #39f;
+  color: #fff;
+}
+.mce-content-body img[data-mce-selected],
+.mce-content-body video[data-mce-selected],
+.mce-content-body audio[data-mce-selected],
+.mce-content-body object[data-mce-selected],
+.mce-content-body embed[data-mce-selected],
+.mce-content-body table[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body hr[data-mce-selected] {
+  outline: 3px solid #b4d7ff;
+  outline-offset: 1px;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body *[contentEditable=false][data-mce-selected] {
+  cursor: not-allowed;
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
+.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
+  outline: none;
+}
+.mce-content-body *[data-mce-selected="inline-boundary"] {
+  background-color: #b4d7ff;
+}
+.mce-content-body .mce-edit-focus {
+  outline: 3px solid #b4d7ff;
+}
+.mce-content-body td[data-mce-selected],
+.mce-content-body th[data-mce-selected] {
+  position: relative;
+}
+.mce-content-body td[data-mce-selected]::-moz-selection,
+.mce-content-body th[data-mce-selected]::-moz-selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected]::selection,
+.mce-content-body th[data-mce-selected]::selection {
+  background: none;
+}
+.mce-content-body td[data-mce-selected] *,
+.mce-content-body th[data-mce-selected] * {
+  outline: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+.mce-content-body td[data-mce-selected]::after,
+.mce-content-body th[data-mce-selected]::after {
+  background-color: rgba(180, 215, 255, 0.7);
+  border: 1px solid rgba(180, 215, 255, 0.7);
+  bottom: -1px;
+  content: '';
+  left: -1px;
+  mix-blend-mode: multiply;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .mce-content-body td[data-mce-selected]::after,
+  .mce-content-body th[data-mce-selected]::after {
+    border-color: rgba(0, 84, 180, 0.7);
+  }
+}
+.mce-content-body img::-moz-selection {
+  background: none;
+}
+.mce-content-body img::selection {
+  background: none;
+}
+.ephox-snooker-resizer-bar {
+  background-color: #b4d7ff;
+  opacity: 0;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.ephox-snooker-resizer-cols {
+  cursor: col-resize;
+}
+.ephox-snooker-resizer-rows {
+  cursor: row-resize;
+}
+.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
+  opacity: 1;
+}
+.mce-spellchecker-word {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+  height: 2rem;
+}
+.mce-spellchecker-grammar {
+  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
+  background-position: 0 calc(100% + 1px);
+  background-repeat: repeat-x;
+  background-size: auto 6px;
+  cursor: default;
+}
+.mce-toc {
+  border: 1px solid gray;
+}
+.mce-toc h2 {
+  margin: 4px;
+}
+.mce-toc li {
+  list-style-type: none;
+}
+table[style*="border-width: 0px"],
+.mce-item-table:not([border]),
+.mce-item-table[border="0"],
+table[style*="border-width: 0px"] td,
+.mce-item-table:not([border]) td,
+.mce-item-table[border="0"] td,
+table[style*="border-width: 0px"] th,
+.mce-item-table:not([border]) th,
+.mce-item-table[border="0"] th,
+table[style*="border-width: 0px"] caption,
+.mce-item-table:not([border]) caption,
+.mce-item-table[border="0"] caption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks p,
+.mce-visualblocks h1,
+.mce-visualblocks h2,
+.mce-visualblocks h3,
+.mce-visualblocks h4,
+.mce-visualblocks h5,
+.mce-visualblocks h6,
+.mce-visualblocks div:not([data-mce-bogus]),
+.mce-visualblocks section,
+.mce-visualblocks article,
+.mce-visualblocks blockquote,
+.mce-visualblocks address,
+.mce-visualblocks pre,
+.mce-visualblocks figure,
+.mce-visualblocks figcaption,
+.mce-visualblocks hgroup,
+.mce-visualblocks aside,
+.mce-visualblocks ul,
+.mce-visualblocks ol,
+.mce-visualblocks dl {
+  background-repeat: no-repeat;
+  border: 1px dashed #bbb;
+  margin-left: 3px;
+  padding-top: 10px;
+}
+.mce-visualblocks p {
+  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
+}
+.mce-visualblocks h1 {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
+}
+.mce-visualblocks h2 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
+}
+.mce-visualblocks h3 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
+}
+.mce-visualblocks h4 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
+}
+.mce-visualblocks h5 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
+}
+.mce-visualblocks h6 {
+  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
+}
+.mce-visualblocks div:not([data-mce-bogus]) {
+  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
+}
+.mce-visualblocks section {
+  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
+}
+.mce-visualblocks article {
+  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
+}
+.mce-visualblocks blockquote {
+  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
+}
+.mce-visualblocks address {
+  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
+}
+.mce-visualblocks pre {
+  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
+}
+.mce-visualblocks figure {
+  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
+}
+.mce-visualblocks figcaption {
+  border: 1px dashed #bbb;
+}
+.mce-visualblocks hgroup {
+  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
+}
+.mce-visualblocks aside {
+  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
+}
+.mce-visualblocks ul {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
+}
+.mce-visualblocks ol {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
+}
+.mce-visualblocks dl {
+  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
+}
+.mce-visualblocks:not([dir=rtl]) p,
+.mce-visualblocks:not([dir=rtl]) h1,
+.mce-visualblocks:not([dir=rtl]) h2,
+.mce-visualblocks:not([dir=rtl]) h3,
+.mce-visualblocks:not([dir=rtl]) h4,
+.mce-visualblocks:not([dir=rtl]) h5,
+.mce-visualblocks:not([dir=rtl]) h6,
+.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
+.mce-visualblocks:not([dir=rtl]) section,
+.mce-visualblocks:not([dir=rtl]) article,
+.mce-visualblocks:not([dir=rtl]) blockquote,
+.mce-visualblocks:not([dir=rtl]) address,
+.mce-visualblocks:not([dir=rtl]) pre,
+.mce-visualblocks:not([dir=rtl]) figure,
+.mce-visualblocks:not([dir=rtl]) figcaption,
+.mce-visualblocks:not([dir=rtl]) hgroup,
+.mce-visualblocks:not([dir=rtl]) aside,
+.mce-visualblocks:not([dir=rtl]) ul,
+.mce-visualblocks:not([dir=rtl]) ol,
+.mce-visualblocks:not([dir=rtl]) dl {
+  margin-left: 3px;
+}
+.mce-visualblocks[dir=rtl] p,
+.mce-visualblocks[dir=rtl] h1,
+.mce-visualblocks[dir=rtl] h2,
+.mce-visualblocks[dir=rtl] h3,
+.mce-visualblocks[dir=rtl] h4,
+.mce-visualblocks[dir=rtl] h5,
+.mce-visualblocks[dir=rtl] h6,
+.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
+.mce-visualblocks[dir=rtl] section,
+.mce-visualblocks[dir=rtl] article,
+.mce-visualblocks[dir=rtl] blockquote,
+.mce-visualblocks[dir=rtl] address,
+.mce-visualblocks[dir=rtl] pre,
+.mce-visualblocks[dir=rtl] figure,
+.mce-visualblocks[dir=rtl] figcaption,
+.mce-visualblocks[dir=rtl] hgroup,
+.mce-visualblocks[dir=rtl] aside,
+.mce-visualblocks[dir=rtl] ul,
+.mce-visualblocks[dir=rtl] ol,
+.mce-visualblocks[dir=rtl] dl {
+  background-position-x: right;
+  margin-right: 3px;
+}
+.mce-nbsp,
+.mce-shy {
+  background: #aaa;
+}
+.mce-shy::after {
+  content: '-';
+}
diff --git a/public/tinymce/skins/oxide/content.inline.min.css b/public/tinymce/skins/oxide/content.inline.min.css
new file mode 100644
index 0000000000..b4ab9a3a56
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.inline.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
diff --git a/public/tinymce/skins/oxide/content.min.css b/public/tinymce/skins/oxide/content.min.css
new file mode 100644
index 0000000000..844858d063
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment{background-color:#fff0b7}.tox-comments-visible .tox-comment--active{background-color:#ffe168}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;-ms-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img::-moz-selection{background:0 0}.mce-content-body img::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/public/tinymce/skins/oxide/content.mobile.css b/public/tinymce/skins/oxide/content.mobile.css
new file mode 100644
index 0000000000..4bdb8babcb
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.mobile.css
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection {
+  /* Note: this file is used inside the content, so isn't part of theming */
+  background-color: green;
+  display: inline-block;
+  opacity: 0.5;
+  position: absolute;
+}
+body {
+  -webkit-text-size-adjust: none;
+}
+body img {
+  /* this is related to the content margin */
+  max-width: 96vw;
+}
+body table img {
+  max-width: 95%;
+}
+body {
+  font-family: sans-serif;
+}
+table {
+  border-collapse: collapse;
+}
diff --git a/public/tinymce/skins/oxide/content.mobile.min.css b/public/tinymce/skins/oxide/content.mobile.min.css
new file mode 100644
index 0000000000..35f7dc08bc
--- /dev/null
+++ b/public/tinymce/skins/oxide/content.mobile.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/public/tinymce/skins/lightgray/fonts/tinymce-mobile.woff b/public/tinymce/skins/oxide/fonts/tinymce-mobile.woff
similarity index 100%
rename from public/tinymce/skins/lightgray/fonts/tinymce-mobile.woff
rename to public/tinymce/skins/oxide/fonts/tinymce-mobile.woff
diff --git a/public/tinymce/skins/oxide/skin.css b/public/tinymce/skins/oxide/skin.css
new file mode 100644
index 0000000000..49a82faf0f
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.css
@@ -0,0 +1,3047 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tox {
+  box-shadow: none;
+  box-sizing: content-box;
+  color: #222f3e;
+  cursor: auto;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: normal;
+  -webkit-tap-highlight-color: transparent;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  vertical-align: initial;
+  white-space: normal;
+}
+.tox *:not(svg):not(rect) {
+  box-sizing: inherit;
+  color: inherit;
+  cursor: inherit;
+  direction: inherit;
+  font-family: inherit;
+  font-size: inherit;
+  font-style: inherit;
+  font-weight: inherit;
+  line-height: inherit;
+  -webkit-tap-highlight-color: inherit;
+  text-align: inherit;
+  text-decoration: inherit;
+  text-shadow: inherit;
+  text-transform: inherit;
+  vertical-align: inherit;
+  white-space: inherit;
+}
+.tox *:not(svg):not(rect) {
+  /* stylelint-disable-line no-duplicate-selectors */
+  background: transparent;
+  border: 0;
+  box-shadow: none;
+  float: none;
+  height: auto;
+  margin: 0;
+  max-width: none;
+  outline: 0;
+  padding: 0;
+  position: static;
+  width: auto;
+}
+.tox:not([dir=rtl]) {
+  direction: ltr;
+  text-align: left;
+}
+.tox[dir=rtl] {
+  direction: rtl;
+  text-align: right;
+}
+.tox-tinymce {
+  border: 1px solid #cccccc;
+  border-radius: 0;
+  box-shadow: none;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  overflow: hidden;
+  position: relative;
+  visibility: inherit !important;
+}
+.tox-tinymce-inline {
+  border: none;
+  box-shadow: none;
+}
+.tox-tinymce-inline .tox-editor-header {
+  background-color: transparent;
+  border: 1px solid #cccccc;
+  border-radius: 0;
+  box-shadow: none;
+}
+.tox-tinymce-aux {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  z-index: 1300;
+}
+.tox-tinymce *:focus,
+.tox-tinymce-aux *:focus {
+  outline: none;
+}
+button::-moz-focus-inner {
+  border: 0;
+}
+.tox[dir=rtl] .tox-icon--flip svg {
+  transform: rotateY(180deg);
+}
+.tox .accessibility-issue__header {
+  align-items: center;
+  display: flex;
+  margin-bottom: 4px;
+}
+.tox .accessibility-issue__description {
+  align-items: stretch;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  display: flex;
+  justify-content: space-between;
+}
+.tox .accessibility-issue__description > div {
+  padding-bottom: 4px;
+}
+.tox .accessibility-issue__description > div > div {
+  align-items: center;
+  display: flex;
+  margin-bottom: 4px;
+}
+.tox .accessibility-issue__description > *:last-child:not(:only-child) {
+  border-color: #cccccc;
+  border-style: solid;
+}
+.tox .accessibility-issue__repair {
+  margin-top: 16px;
+}
+.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description {
+  background-color: rgba(32, 122, 183, 0.1);
+  border-color: rgba(32, 122, 183, 0.4);
+  color: #222f3e;
+}
+.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description > *:last-child {
+  border-color: rgba(32, 122, 183, 0.4);
+}
+.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2 {
+  color: #207ab7;
+}
+.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg {
+  fill: #207ab7;
+}
+.tox .tox-dialog__body-content .accessibility-issue--info a .tox-icon {
+  color: #207ab7;
+}
+.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description {
+  background-color: rgba(255, 165, 0, 0.1);
+  border-color: rgba(255, 165, 0, 0.5);
+  color: #222f3e;
+}
+.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description > *:last-child {
+  border-color: rgba(255, 165, 0, 0.5);
+}
+.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2 {
+  color: #cc8500;
+}
+.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg {
+  fill: #cc8500;
+}
+.tox .tox-dialog__body-content .accessibility-issue--warn a .tox-icon {
+  color: #cc8500;
+}
+.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description {
+  background-color: rgba(204, 0, 0, 0.1);
+  border-color: rgba(204, 0, 0, 0.4);
+  color: #222f3e;
+}
+.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description > *:last-child {
+  border-color: rgba(204, 0, 0, 0.4);
+}
+.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2 {
+  color: #c00;
+}
+.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg {
+  fill: #c00;
+}
+.tox .tox-dialog__body-content .accessibility-issue--error a .tox-icon {
+  color: #c00;
+}
+.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description {
+  background-color: rgba(120, 171, 70, 0.1);
+  border-color: rgba(120, 171, 70, 0.4);
+  color: #222f3e;
+}
+.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description > *:last-child {
+  border-color: rgba(120, 171, 70, 0.4);
+}
+.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2 {
+  color: #78AB46;
+}
+.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg {
+  fill: #78AB46;
+}
+.tox .tox-dialog__body-content .accessibility-issue--success a .tox-icon {
+  color: #78AB46;
+}
+.tox .tox-dialog__body-content .accessibility-issue__header h1,
+.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2 {
+  margin-top: 0;
+}
+.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button {
+  margin-left: 4px;
+}
+.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header > *:nth-last-child(2) {
+  margin-left: auto;
+}
+.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description {
+  padding: 4px 4px 4px 8px;
+}
+.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description > *:last-child {
+  border-left-width: 1px;
+  padding-left: 4px;
+}
+.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button {
+  margin-right: 4px;
+}
+.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header > *:nth-last-child(2) {
+  margin-right: auto;
+}
+.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description {
+  padding: 4px 8px 4px 4px;
+}
+.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description > *:last-child {
+  border-right-width: 1px;
+  padding-right: 4px;
+}
+.tox .tox-anchorbar {
+  display: flex;
+  flex: 0 0 auto;
+}
+.tox .tox-bar {
+  display: flex;
+  flex: 0 0 auto;
+}
+.tox .tox-button {
+  background-color: #207ab7;
+  background-image: none;
+  background-position: 0 0;
+  background-repeat: repeat;
+  border-color: #207ab7;
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  box-sizing: border-box;
+  color: #fff;
+  cursor: pointer;
+  display: inline-block;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: bold;
+  letter-spacing: normal;
+  line-height: 24px;
+  margin: 0;
+  outline: none;
+  padding: 4px 16px;
+  text-align: center;
+  text-decoration: none;
+  text-transform: none;
+  white-space: nowrap;
+}
+.tox .tox-button[disabled] {
+  background-color: #207ab7;
+  background-image: none;
+  border-color: #207ab7;
+  box-shadow: none;
+  color: rgba(255, 255, 255, 0.5);
+  cursor: not-allowed;
+}
+.tox .tox-button:focus:not(:disabled) {
+  background-color: #1c6ca1;
+  background-image: none;
+  border-color: #1c6ca1;
+  box-shadow: none;
+  color: #fff;
+}
+.tox .tox-button:hover:not(:disabled) {
+  background-color: #1c6ca1;
+  background-image: none;
+  border-color: #1c6ca1;
+  box-shadow: none;
+  color: #fff;
+}
+.tox .tox-button:active:not(:disabled) {
+  background-color: #185d8c;
+  background-image: none;
+  border-color: #185d8c;
+  box-shadow: none;
+  color: #fff;
+}
+.tox .tox-button--secondary {
+  background-color: #f0f0f0;
+  background-image: none;
+  background-position: 0 0;
+  background-repeat: repeat;
+  border-color: #f0f0f0;
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  color: #222f3e;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: bold;
+  letter-spacing: normal;
+  outline: none;
+  padding: 4px 16px;
+  text-decoration: none;
+  text-transform: none;
+}
+.tox .tox-button--secondary[disabled] {
+  background-color: #f0f0f0;
+  background-image: none;
+  border-color: #f0f0f0;
+  box-shadow: none;
+  color: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-button--secondary:focus:not(:disabled) {
+  background-color: #e3e3e3;
+  background-image: none;
+  border-color: #e3e3e3;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--secondary:hover:not(:disabled) {
+  background-color: #e3e3e3;
+  background-image: none;
+  border-color: #e3e3e3;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--secondary:active:not(:disabled) {
+  background-color: #d6d6d6;
+  background-image: none;
+  border-color: #d6d6d6;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--icon,
+.tox .tox-button.tox-button--icon,
+.tox .tox-button.tox-button--secondary.tox-button--icon {
+  padding: 4px;
+}
+.tox .tox-button--icon .tox-icon svg,
+.tox .tox-button.tox-button--icon .tox-icon svg,
+.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg {
+  display: block;
+  fill: currentColor;
+}
+.tox .tox-button-link {
+  background: 0;
+  border: none;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: inline-block;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: 1.3;
+  margin: 0;
+  padding: 0;
+  white-space: nowrap;
+}
+.tox .tox-button-link--sm {
+  font-size: 14px;
+}
+.tox .tox-button--naked {
+  background-color: transparent;
+  border-color: transparent;
+  box-shadow: unset;
+  color: #222f3e;
+}
+.tox .tox-button--naked[disabled] {
+  background-color: #f0f0f0;
+  border-color: #f0f0f0;
+  box-shadow: none;
+  color: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-button--naked:hover:not(:disabled) {
+  background-color: #e3e3e3;
+  border-color: #e3e3e3;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--naked:focus:not(:disabled) {
+  background-color: #e3e3e3;
+  border-color: #e3e3e3;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--naked:active:not(:disabled) {
+  background-color: #d6d6d6;
+  border-color: #d6d6d6;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-button--naked .tox-icon svg {
+  fill: currentColor;
+}
+.tox .tox-button--naked.tox-button--icon:hover:not(:disabled) {
+  color: #222f3e;
+}
+.tox .tox-checkbox {
+  align-items: center;
+  border-radius: 3px;
+  cursor: pointer;
+  display: flex;
+  height: 36px;
+  min-width: 36px;
+}
+.tox .tox-checkbox__input {
+  /* Hide from view but visible to screen readers */
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  top: auto;
+  width: 1px;
+}
+.tox .tox-checkbox__icons {
+  align-items: center;
+  border-radius: 3px;
+  box-shadow: 0 0 0 2px transparent;
+  box-sizing: content-box;
+  display: flex;
+  height: 24px;
+  justify-content: center;
+  padding: calc(4px - 1px);
+  width: 24px;
+}
+.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg {
+  display: block;
+  fill: rgba(34, 47, 62, 0.3);
+}
+.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg {
+  display: none;
+  fill: #207ab7;
+}
+.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg {
+  display: none;
+  fill: #207ab7;
+}
+.tox .tox-checkbox--disabled {
+  color: rgba(34, 47, 62, 0.5);
+  cursor: not-allowed;
+}
+.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox input.tox-checkbox__input:checked + .tox-checkbox__icons .tox-checkbox-icon__unchecked svg {
+  display: none;
+}
+.tox input.tox-checkbox__input:checked + .tox-checkbox__icons .tox-checkbox-icon__checked svg {
+  display: block;
+}
+.tox input.tox-checkbox__input:indeterminate + .tox-checkbox__icons .tox-checkbox-icon__unchecked svg {
+  display: none;
+}
+.tox input.tox-checkbox__input:indeterminate + .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg {
+  display: block;
+}
+.tox input.tox-checkbox__input:focus + .tox-checkbox__icons {
+  border-radius: 3px;
+  box-shadow: inset 0 0 0 1px #207ab7;
+  padding: calc(4px - 1px);
+}
+.tox:not([dir=rtl]) .tox-checkbox__label {
+  margin-left: 4px;
+}
+.tox:not([dir=rtl]) .tox-checkbox__input {
+  left: -10000px;
+}
+.tox:not([dir=rtl]) .tox-bar .tox-checkbox {
+  margin-left: 4px;
+}
+.tox[dir=rtl] .tox-checkbox__label {
+  margin-right: 4px;
+}
+.tox[dir=rtl] .tox-checkbox__input {
+  right: -10000px;
+}
+.tox[dir=rtl] .tox-bar .tox-checkbox {
+  margin-right: 4px;
+}
+.tox {
+  /* stylelint-disable-next-line no-descending-specificity */
+}
+.tox .tox-collection--toolbar .tox-collection__group {
+  display: flex;
+  padding: 0;
+}
+.tox .tox-collection--grid .tox-collection__group {
+  display: flex;
+  flex-wrap: wrap;
+  max-height: 208px;
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding: 0;
+}
+.tox .tox-collection--list .tox-collection__group {
+  border-bottom-width: 0;
+  border-color: #cccccc;
+  border-left-width: 0;
+  border-right-width: 0;
+  border-style: solid;
+  border-top-width: 1px;
+  padding: 4px 0;
+}
+.tox .tox-collection--list .tox-collection__group:first-child {
+  border-top-width: 0;
+}
+.tox .tox-collection__group-heading {
+  background-color: #e6e6e6;
+  color: rgba(34, 47, 62, 0.7);
+  cursor: default;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: normal;
+  margin-bottom: 4px;
+  margin-top: -4px;
+  padding: 4px 8px;
+  text-transform: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+.tox .tox-collection__item {
+  align-items: center;
+  color: #222f3e;
+  cursor: pointer;
+  display: flex;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+.tox .tox-collection--list .tox-collection__item {
+  padding: 4px 8px;
+}
+.tox .tox-collection--toolbar .tox-collection__item {
+  border-radius: 3px;
+  padding: 4px;
+}
+.tox .tox-collection--grid .tox-collection__item {
+  border-radius: 3px;
+  padding: 4px;
+}
+.tox .tox-collection--list .tox-collection__item--enabled {
+  background-color: #fff;
+  color: #222f3e;
+}
+.tox .tox-collection--list .tox-collection__item--active {
+  background-color: #dee0e2;
+}
+.tox .tox-collection--toolbar .tox-collection__item--enabled {
+  background-color: #c8cbcf;
+  color: #222f3e;
+}
+.tox .tox-collection--toolbar .tox-collection__item--active {
+  background-color: #dee0e2;
+}
+.tox .tox-collection--grid .tox-collection__item--enabled {
+  background-color: #c8cbcf;
+  color: #222f3e;
+}
+.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
+  background-color: #dee0e2;
+  color: #222f3e;
+}
+.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
+  color: #222f3e;
+}
+.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
+  color: #222f3e;
+}
+.tox .tox-collection__item-icon,
+.tox .tox-collection__item-checkmark {
+  align-items: center;
+  display: flex;
+  height: 24px;
+  justify-content: center;
+  width: 24px;
+}
+.tox .tox-collection__item-icon svg,
+.tox .tox-collection__item-checkmark svg {
+  fill: currentColor;
+}
+.tox .tox-collection--toolbar-lg .tox-collection__item-icon {
+  height: 48px;
+  width: 48px;
+}
+.tox .tox-collection__item-label {
+  color: currentColor;
+  display: inline-block;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 24px;
+  text-transform: none;
+  word-break: break-all;
+}
+.tox .tox-collection__item-accessory {
+  color: rgba(34, 47, 62, 0.7);
+  display: inline-block;
+  font-size: 14px;
+  height: 24px;
+  line-height: 24px;
+  text-transform: none;
+}
+.tox .tox-collection__item-caret {
+  align-items: center;
+  display: flex;
+  min-height: 24px;
+}
+.tox .tox-collection__item-caret::after {
+  content: '';
+  font-size: 0;
+  min-height: inherit;
+}
+.tox .tox-collection__item-caret svg {
+  fill: #222f3e;
+}
+.tox .tox-collection__item--state-disabled {
+  background-color: transparent;
+  color: rgba(34, 47, 62, 0.5);
+  cursor: not-allowed;
+}
+.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg {
+  display: none;
+}
+.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory + .tox-collection__item-checkmark {
+  display: none;
+}
+.tox .tox-collection--horizontal {
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+  display: flex;
+  flex: 0 0 auto;
+  flex-shrink: 0;
+  flex-wrap: nowrap;
+  margin-bottom: 0;
+  overflow-x: auto;
+  padding: 0;
+}
+.tox .tox-collection--horizontal .tox-collection__group {
+  align-items: center;
+  display: flex;
+  flex-wrap: nowrap;
+  margin: 0;
+  padding: 0 4px;
+}
+.tox .tox-collection--horizontal .tox-collection__item {
+  height: 34px;
+  margin: 2px 0 3px 0;
+  padding: 0 4px;
+}
+.tox .tox-collection--horizontal .tox-collection__item-label {
+  white-space: nowrap;
+}
+.tox .tox-collection--horizontal .tox-collection__item-caret {
+  margin-left: 4px;
+}
+.tox .tox-collection__item-container {
+  display: flex;
+}
+.tox .tox-collection__item-container--row {
+  align-items: center;
+  flex: 1 1 auto;
+  flex-direction: row;
+}
+.tox .tox-collection__item-container--row.tox-collection__item-container--align-left {
+  margin-right: auto;
+}
+.tox .tox-collection__item-container--row.tox-collection__item-container--align-right {
+  justify-content: flex-end;
+  margin-left: auto;
+}
+.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top {
+  align-items: flex-start;
+  margin-bottom: auto;
+}
+.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle {
+  align-items: center;
+}
+.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom {
+  align-items: flex-end;
+  margin-top: auto;
+}
+.tox .tox-collection__item-container--column {
+  -ms-grid-row-align: center;
+      align-self: center;
+  flex: 1 1 auto;
+  flex-direction: column;
+}
+.tox .tox-collection__item-container--column.tox-collection__item-container--align-left {
+  align-items: flex-start;
+}
+.tox .tox-collection__item-container--column.tox-collection__item-container--align-right {
+  align-items: flex-end;
+}
+.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top {
+  align-self: flex-start;
+}
+.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle {
+  -ms-grid-row-align: center;
+      align-self: center;
+}
+.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom {
+  align-self: flex-end;
+}
+.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type) {
+  border-right: 1px solid #cccccc;
+}
+.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item > *:not(:first-child) {
+  margin-left: 8px;
+}
+.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item > .tox-collection__item-label:first-child {
+  margin-left: 4px;
+}
+.tox:not([dir=rtl]) .tox-collection__item-accessory {
+  margin-left: 16px;
+  text-align: right;
+}
+.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret {
+  margin-left: 16px;
+}
+.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type) {
+  border-left: 1px solid #cccccc;
+}
+.tox[dir=rtl] .tox-collection--list .tox-collection__item > *:not(:first-child) {
+  margin-right: 8px;
+}
+.tox[dir=rtl] .tox-collection--list .tox-collection__item > .tox-collection__item-label:first-child {
+  margin-right: 4px;
+}
+.tox[dir=rtl] .tox-collection__item-accessory {
+  margin-right: 16px;
+  text-align: left;
+}
+.tox[dir=rtl] .tox-collection .tox-collection__item-caret {
+  margin-right: 16px;
+  transform: rotateY(180deg);
+}
+.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret {
+  margin-right: 4px;
+}
+.tox .tox-color-picker-container {
+  display: flex;
+  flex-direction: row;
+  height: 225px;
+  margin: 0;
+}
+.tox .tox-sv-palette {
+  box-sizing: border-box;
+  display: flex;
+  height: 100%;
+}
+.tox .tox-sv-palette-spectrum {
+  height: 100%;
+}
+.tox .tox-sv-palette,
+.tox .tox-sv-palette-spectrum {
+  width: 225px;
+}
+.tox .tox-sv-palette-thumb {
+  background: none;
+  border: 1px solid black;
+  border-radius: 50%;
+  box-sizing: content-box;
+  height: 12px;
+  position: absolute;
+  width: 12px;
+}
+.tox .tox-sv-palette-inner-thumb {
+  border: 1px solid white;
+  border-radius: 50%;
+  height: 10px;
+  position: absolute;
+  width: 10px;
+}
+.tox .tox-hue-slider {
+  box-sizing: border-box;
+  height: 100%;
+  width: 25px;
+}
+.tox .tox-hue-slider-spectrum {
+  background: linear-gradient(to bottom, #f00, #ff0080, #f0f, #8000ff, #00f, #0080ff, #0ff, #00ff80, #0f0, #80ff00, #ff0, #ff8000, #f00);
+  height: 100%;
+  width: 100%;
+}
+.tox .tox-hue-slider,
+.tox .tox-hue-slider-spectrum {
+  width: 20px;
+}
+.tox .tox-hue-slider-thumb {
+  background: white;
+  border: 1px solid black;
+  box-sizing: content-box;
+  height: 4px;
+  width: 100%;
+}
+.tox .tox-rgb-form {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.tox .tox-rgb-form div {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 5px;
+  width: inherit;
+}
+.tox .tox-rgb-form input {
+  width: 6em;
+}
+.tox .tox-rgb-form input.tox-invalid {
+  /* Need !important to override Chrome's focus styling unfortunately */
+  border: 1px solid red !important;
+}
+.tox .tox-rgb-form .tox-rgba-preview {
+  border: 1px solid black;
+  flex-grow: 2;
+  margin-bottom: 0;
+}
+.tox:not([dir=rtl]) .tox-sv-palette {
+  margin-right: 15px;
+}
+.tox:not([dir=rtl]) .tox-hue-slider {
+  margin-right: 15px;
+}
+.tox:not([dir=rtl]) .tox-hue-slider-thumb {
+  margin-left: -1px;
+}
+.tox:not([dir=rtl]) .tox-rgb-form label {
+  margin-right: 0.5em;
+}
+.tox[dir=rtl] .tox-sv-palette {
+  margin-left: 15px;
+}
+.tox[dir=rtl] .tox-hue-slider {
+  margin-left: 15px;
+}
+.tox[dir=rtl] .tox-hue-slider-thumb {
+  margin-right: -1px;
+}
+.tox[dir=rtl] .tox-rgb-form label {
+  margin-left: 0.5em;
+}
+.tox .tox-toolbar .tox-swatches,
+.tox .tox-toolbar__primary .tox-swatches,
+.tox .tox-toolbar__overflow .tox-swatches {
+  margin: 2px 0 3px 4px;
+}
+.tox .tox-collection--list .tox-collection__group .tox-swatches-menu {
+  border: 0;
+  margin: -4px 0;
+}
+.tox .tox-swatches__row {
+  display: flex;
+}
+.tox .tox-swatch {
+  height: 30px;
+  transition: transform 0.15s, box-shadow 0.15s;
+  width: 30px;
+}
+.tox .tox-swatch:hover,
+.tox .tox-swatch:focus {
+  box-shadow: 0 0 0 1px rgba(127, 127, 127, 0.3) inset;
+  transform: scale(0.8);
+}
+.tox .tox-swatch--remove {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+.tox .tox-swatch--remove svg path {
+  stroke: #e74c3c;
+}
+.tox .tox-swatches__picker-btn {
+  align-items: center;
+  background-color: transparent;
+  border: 0;
+  cursor: pointer;
+  display: flex;
+  height: 30px;
+  justify-content: center;
+  outline: none;
+  padding: 0;
+  width: 30px;
+}
+.tox .tox-swatches__picker-btn svg {
+  height: 24px;
+  width: 24px;
+}
+.tox .tox-swatches__picker-btn:hover {
+  background: #dee0e2;
+}
+.tox:not([dir=rtl]) .tox-swatches__picker-btn {
+  margin-left: auto;
+}
+.tox[dir=rtl] .tox-swatches__picker-btn {
+  margin-right: auto;
+}
+.tox .tox-comment-thread {
+  background: #fff;
+  position: relative;
+}
+.tox .tox-comment-thread > *:not(:first-child) {
+  margin-top: 8px;
+}
+.tox .tox-comment {
+  background: #fff;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  box-shadow: 0 4px 8px 0 rgba(34, 47, 62, 0.1);
+  padding: 8px 8px 16px 8px;
+  position: relative;
+}
+.tox .tox-comment__header {
+  align-items: center;
+  color: #222f3e;
+  display: flex;
+  justify-content: space-between;
+}
+.tox .tox-comment__date {
+  color: rgba(34, 47, 62, 0.7);
+  font-size: 12px;
+}
+.tox .tox-comment__body {
+  color: #222f3e;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1.3;
+  margin-top: 8px;
+  position: relative;
+  text-transform: initial;
+}
+.tox .tox-comment__body textarea {
+  resize: none;
+  white-space: normal;
+  width: 100%;
+}
+.tox .tox-comment__expander {
+  padding-top: 8px;
+}
+.tox .tox-comment__expander p {
+  color: rgba(34, 47, 62, 0.7);
+  font-size: 14px;
+  font-style: normal;
+}
+.tox .tox-comment__body p {
+  margin: 0;
+}
+.tox .tox-comment__buttonspacing {
+  padding-top: 16px;
+  text-align: center;
+}
+.tox .tox-comment-thread__overlay::after {
+  background: #fff;
+  bottom: 0;
+  content: "";
+  display: flex;
+  left: 0;
+  opacity: 0.9;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 5;
+}
+.tox .tox-comment__reply {
+  display: flex;
+  flex-shrink: 0;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  margin-top: 8px;
+}
+.tox .tox-comment__reply > *:first-child {
+  margin-bottom: 8px;
+  width: 100%;
+}
+.tox .tox-comment__edit {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+.tox .tox-comment__gradient::after {
+  background: linear-gradient(rgba(255, 255, 255, 0), #fff);
+  bottom: 0;
+  content: "";
+  display: block;
+  height: 5em;
+  margin-top: -40px;
+  position: absolute;
+  width: 100%;
+}
+.tox .tox-comment__overlay {
+  background: #fff;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  left: 0;
+  opacity: 0.9;
+  position: absolute;
+  right: 0;
+  text-align: center;
+  top: 0;
+  z-index: 5;
+}
+.tox .tox-comment__loading-text {
+  align-items: center;
+  color: #222f3e;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+.tox .tox-comment__loading-text > div {
+  padding-bottom: 16px;
+}
+.tox .tox-comment__overlaytext {
+  bottom: 0;
+  flex-direction: column;
+  font-size: 14px;
+  left: 0;
+  padding: 1em;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 10;
+}
+.tox .tox-comment__overlaytext p {
+  background-color: #fff;
+  box-shadow: 0 0 8px 8px #fff;
+  color: #222f3e;
+  text-align: center;
+}
+.tox .tox-comment__overlaytext div:nth-of-type(2) {
+  font-size: 0.8em;
+}
+.tox .tox-comment__busy-spinner {
+  align-items: center;
+  background-color: #fff;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 20;
+}
+.tox .tox-comment__scroll {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 1;
+  overflow: auto;
+}
+.tox .tox-conversations {
+  margin: 8px;
+}
+.tox:not([dir=rtl]) .tox-comment__edit {
+  margin-left: 8px;
+}
+.tox:not([dir=rtl]) .tox-comment__buttonspacing > *:last-child,
+.tox:not([dir=rtl]) .tox-comment__edit > *:last-child,
+.tox:not([dir=rtl]) .tox-comment__reply > *:last-child {
+  margin-left: 8px;
+}
+.tox[dir=rtl] .tox-comment__edit {
+  margin-right: 8px;
+}
+.tox[dir=rtl] .tox-comment__buttonspacing > *:last-child,
+.tox[dir=rtl] .tox-comment__edit > *:last-child,
+.tox[dir=rtl] .tox-comment__reply > *:last-child {
+  margin-right: 8px;
+}
+.tox .tox-user {
+  align-items: center;
+  display: flex;
+}
+.tox .tox-user__avatar svg {
+  fill: rgba(34, 47, 62, 0.7);
+}
+.tox .tox-user__name {
+  color: rgba(34, 47, 62, 0.7);
+  font-size: 12px;
+  font-style: normal;
+  font-weight: bold;
+  text-transform: uppercase;
+}
+.tox:not([dir=rtl]) .tox-user__avatar svg {
+  margin-right: 8px;
+}
+.tox:not([dir=rtl]) .tox-user__avatar + .tox-user__name {
+  margin-left: 8px;
+}
+.tox[dir=rtl] .tox-user__avatar svg {
+  margin-left: 8px;
+}
+.tox[dir=rtl] .tox-user__avatar + .tox-user__name {
+  margin-right: 8px;
+}
+.tox .tox-dialog-wrap {
+  align-items: center;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  left: 0;
+  position: fixed;
+  right: 0;
+  top: 0;
+  z-index: 1100;
+}
+.tox .tox-dialog-wrap__backdrop {
+  background-color: rgba(255, 255, 255, 0.75);
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+}
+.tox .tox-dialog-wrap__backdrop--opaque {
+  background-color: #fff;
+}
+.tox .tox-dialog {
+  background-color: #fff;
+  border-color: #cccccc;
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: 0 16px 16px -10px rgba(34, 47, 62, 0.15), 0 0 40px 1px rgba(34, 47, 62, 0.15);
+  display: flex;
+  flex-direction: column;
+  max-height: 100%;
+  max-width: 480px;
+  overflow: hidden;
+  position: relative;
+  width: 95vw;
+  z-index: 2;
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox .tox-dialog {
+    align-self: flex-start;
+    margin: 8px auto;
+    width: calc(100vw - 16px);
+  }
+}
+.tox .tox-dialog-inline {
+  z-index: 1100;
+}
+.tox .tox-dialog__header {
+  align-items: center;
+  background-color: #fff;
+  border-bottom: none;
+  color: #222f3e;
+  display: flex;
+  font-size: 16px;
+  justify-content: space-between;
+  padding: 8px 16px 0 16px;
+  position: relative;
+}
+.tox .tox-dialog__header .tox-button {
+  z-index: 1;
+}
+.tox .tox-dialog__draghandle {
+  cursor: grab;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.tox .tox-dialog__draghandle:active {
+  cursor: grabbing;
+}
+.tox .tox-dialog__dismiss {
+  margin-left: auto;
+}
+.tox .tox-dialog__title {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 20px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1.3;
+  margin: 0;
+  text-transform: none;
+}
+.tox .tox-dialog__body {
+  color: #222f3e;
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1.3;
+  min-width: 0;
+  text-align: left;
+  text-transform: none;
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox .tox-dialog__body {
+    flex-direction: column;
+  }
+}
+.tox .tox-dialog__body-nav {
+  align-items: flex-start;
+  display: flex;
+  flex-direction: column;
+  padding: 16px 16px;
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox .tox-dialog__body-nav {
+    flex-direction: row;
+    -webkit-overflow-scrolling: touch;
+    overflow-x: auto;
+    padding-bottom: 0;
+  }
+}
+.tox .tox-dialog__body-nav-item {
+  border-bottom: 2px solid transparent;
+  color: rgba(34, 47, 62, 0.7);
+  display: inline-block;
+  font-size: 14px;
+  line-height: 1.3;
+  margin-bottom: 8px;
+  text-decoration: none;
+  white-space: nowrap;
+}
+.tox .tox-dialog__body-nav-item:focus {
+  background-color: rgba(32, 122, 183, 0.1);
+}
+.tox .tox-dialog__body-nav-item--active {
+  border-bottom: 2px solid #207ab7;
+  color: #207ab7;
+}
+.tox .tox-dialog__body-content {
+  box-sizing: border-box;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  -ms-flex-preferred-size: auto;
+  max-height: 650px;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  padding: 16px 16px;
+}
+.tox .tox-dialog__body-content > * {
+  margin-bottom: 0;
+  margin-top: 16px;
+}
+.tox .tox-dialog__body-content > *:first-child {
+  margin-top: 0;
+}
+.tox .tox-dialog__body-content > *:last-child {
+  margin-bottom: 0;
+}
+.tox .tox-dialog__body-content > *:only-child {
+  margin-bottom: 0;
+  margin-top: 0;
+}
+.tox .tox-dialog__body-content a {
+  color: #207ab7;
+  cursor: pointer;
+  text-decoration: none;
+}
+.tox .tox-dialog__body-content a:hover,
+.tox .tox-dialog__body-content a:focus {
+  color: #185d8c;
+  text-decoration: none;
+}
+.tox .tox-dialog__body-content a:active {
+  color: #185d8c;
+  text-decoration: none;
+}
+.tox .tox-dialog__body-content svg {
+  fill: #222f3e;
+}
+.tox .tox-dialog__body-content ul {
+  display: block;
+  list-style-type: disc;
+  margin-bottom: 16px;
+  -webkit-margin-end: 0;
+          margin-inline-end: 0;
+  -webkit-margin-start: 0;
+          margin-inline-start: 0;
+  -webkit-padding-start: 2.5rem;
+          padding-inline-start: 2.5rem;
+}
+.tox .tox-dialog__body-content .tox-form__group h1 {
+  color: #222f3e;
+  font-size: 20px;
+  font-style: normal;
+  font-weight: bold;
+  letter-spacing: normal;
+  margin-bottom: 16px;
+  margin-top: 2rem;
+  text-transform: none;
+}
+.tox .tox-dialog__body-content .tox-form__group h2 {
+  color: #222f3e;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: bold;
+  letter-spacing: normal;
+  margin-bottom: 16px;
+  margin-top: 2rem;
+  text-transform: none;
+}
+.tox .tox-dialog__body-content .tox-form__group p {
+  margin-bottom: 16px;
+}
+.tox .tox-dialog__body-content .tox-form__group h1:first-child,
+.tox .tox-dialog__body-content .tox-form__group h2:first-child,
+.tox .tox-dialog__body-content .tox-form__group p:first-child {
+  margin-top: 0;
+}
+.tox .tox-dialog__body-content .tox-form__group h1:last-child,
+.tox .tox-dialog__body-content .tox-form__group h2:last-child,
+.tox .tox-dialog__body-content .tox-form__group p:last-child {
+  margin-bottom: 0;
+}
+.tox .tox-dialog__body-content .tox-form__group h1:only-child,
+.tox .tox-dialog__body-content .tox-form__group h2:only-child,
+.tox .tox-dialog__body-content .tox-form__group p:only-child {
+  margin-bottom: 0;
+  margin-top: 0;
+}
+.tox .tox-dialog--width-lg {
+  height: 650px;
+  max-width: 1200px;
+}
+.tox .tox-dialog--width-md {
+  max-width: 800px;
+}
+.tox .tox-dialog--width-md .tox-dialog__body-content {
+  overflow: auto;
+}
+.tox .tox-dialog__body-content--centered {
+  text-align: center;
+}
+.tox .tox-dialog__footer {
+  align-items: center;
+  background-color: #fff;
+  border-top: 1px solid #cccccc;
+  display: flex;
+  justify-content: space-between;
+  padding: 8px 16px;
+}
+.tox .tox-dialog__footer-start,
+.tox .tox-dialog__footer-end {
+  display: flex;
+}
+.tox .tox-dialog__busy-spinner {
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.75);
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 3;
+}
+.tox .tox-dialog__table {
+  border-collapse: collapse;
+  width: 100%;
+}
+.tox .tox-dialog__table thead th {
+  font-weight: bold;
+  padding-bottom: 8px;
+}
+.tox .tox-dialog__table tbody tr {
+  border-bottom: 1px solid #cccccc;
+}
+.tox .tox-dialog__table tbody tr:last-child {
+  border-bottom: none;
+}
+.tox .tox-dialog__table td {
+  padding-bottom: 8px;
+  padding-top: 8px;
+}
+.tox .tox-dialog__popups {
+  position: absolute;
+  width: 100%;
+  z-index: 1100;
+}
+.tox .tox-dialog__body-iframe {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-dialog__body-iframe .tox-navobj {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2) {
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  height: 100%;
+}
+.tox .tox-dialog-dock-fadeout {
+  opacity: 0;
+  visibility: hidden;
+}
+.tox .tox-dialog-dock-fadein {
+  opacity: 1;
+  visibility: visible;
+}
+.tox .tox-dialog-dock-transition {
+  transition: visibility 0s linear 0.3s, opacity 0.3s ease;
+}
+.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein {
+  transition-delay: 0s;
+}
+.tox.tox-platform-ie {
+  /* IE11 CSS styles go here */
+}
+.tox.tox-platform-ie .tox-dialog-wrap {
+  position: -ms-device-fixed;
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav {
+    margin-right: 0;
+  }
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child) {
+    margin-left: 8px;
+  }
+}
+.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start > *,
+.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end > * {
+  margin-left: 8px;
+}
+.tox[dir=rtl] .tox-dialog__body {
+  text-align: right;
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav {
+    margin-left: 0;
+  }
+}
+@media only screen and (max-width:767px) {
+  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child) {
+    margin-right: 8px;
+  }
+}
+.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start > *,
+.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end > * {
+  margin-right: 8px;
+}
+body.tox-dialog__disable-scroll {
+  overflow: hidden;
+}
+.tox .tox-dropzone-container {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-dropzone {
+  align-items: center;
+  background: #fff;
+  border: 2px dashed #cccccc;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  justify-content: center;
+  min-height: 100px;
+  padding: 10px;
+}
+.tox .tox-dropzone p {
+  color: rgba(34, 47, 62, 0.7);
+  margin: 0 0 16px 0;
+}
+.tox .tox-edit-area {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  overflow: hidden;
+  position: relative;
+}
+.tox .tox-edit-area__iframe {
+  background-color: #fff;
+  border: 0;
+  box-sizing: border-box;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  height: 100%;
+  position: absolute;
+  width: 100%;
+}
+.tox.tox-inline-edit-area {
+  border: 1px dotted #cccccc;
+}
+.tox .tox-editor-container {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+  overflow: hidden;
+}
+.tox .tox-editor-header {
+  z-index: 1;
+}
+.tox:not(.tox-tinymce-inline) .tox-editor-header {
+  box-shadow: none;
+  transition: box-shadow 0.5s;
+}
+.tox.tox-tinymce--toolbar-bottom .tox-editor-header,
+.tox.tox-tinymce-inline .tox-editor-header {
+  margin-bottom: -1px;
+}
+.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header {
+  background-color: transparent;
+  box-shadow: 0 4px 4px -3px rgba(0, 0, 0, 0.25);
+}
+.tox-editor-dock-fadeout {
+  opacity: 0;
+  visibility: hidden;
+}
+.tox-editor-dock-fadein {
+  opacity: 1;
+  visibility: visible;
+}
+.tox-editor-dock-transition {
+  transition: visibility 0s linear 0.25s, opacity 0.25s ease;
+}
+.tox-editor-dock-transition.tox-editor-dock-fadein {
+  transition-delay: 0s;
+}
+.tox .tox-control-wrap {
+  flex: 1;
+  position: relative;
+}
+.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,
+.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,
+.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid {
+  display: none;
+}
+.tox .tox-control-wrap svg {
+  display: block;
+}
+.tox .tox-control-wrap__status-icon-wrap {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.tox .tox-control-wrap__status-icon-invalid svg {
+  fill: #c00;
+}
+.tox .tox-control-wrap__status-icon-unknown svg {
+  fill: orange;
+}
+.tox .tox-control-wrap__status-icon-valid svg {
+  fill: green;
+}
+.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,
+.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,
+.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield {
+  padding-right: 32px;
+}
+.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap {
+  right: 4px;
+}
+.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,
+.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,
+.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield {
+  padding-left: 32px;
+}
+.tox[dir=rtl] .tox-control-wrap__status-icon-wrap {
+  left: 4px;
+}
+.tox .tox-autocompleter {
+  max-width: 25em;
+}
+.tox .tox-autocompleter .tox-menu {
+  max-width: 25em;
+}
+.tox .tox-autocompleter .tox-autocompleter-highlight {
+  font-weight: bold;
+}
+.tox .tox-color-input {
+  display: flex;
+  position: relative;
+  z-index: 1;
+}
+.tox .tox-color-input .tox-textfield {
+  z-index: -1;
+}
+.tox .tox-color-input span {
+  border-color: rgba(34, 47, 62, 0.2);
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  box-sizing: border-box;
+  height: 24px;
+  position: absolute;
+  top: 6px;
+  width: 24px;
+}
+.tox .tox-color-input span:hover:not([aria-disabled=true]),
+.tox .tox-color-input span:focus:not([aria-disabled=true]) {
+  border-color: #207ab7;
+  cursor: pointer;
+}
+.tox .tox-color-input span::before {
+  background-image: linear-gradient(45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%), linear-gradient(-45deg, rgba(0, 0, 0, 0.25) 25%, transparent 25%), linear-gradient(45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%), linear-gradient(-45deg, transparent 75%, rgba(0, 0, 0, 0.25) 75%);
+  background-position: 0 0, 0 6px, 6px -6px, -6px 0;
+  background-size: 12px 12px;
+  border: 1px solid #fff;
+  border-radius: 3px;
+  box-sizing: border-box;
+  content: '';
+  height: 24px;
+  left: -1px;
+  position: absolute;
+  top: -1px;
+  width: 24px;
+  z-index: -1;
+}
+.tox .tox-color-input span[aria-disabled=true] {
+  cursor: not-allowed;
+}
+.tox:not([dir=rtl]) .tox-color-input {
+  /* stylelint-disable-next-line no-descending-specificity */
+}
+.tox:not([dir=rtl]) .tox-color-input .tox-textfield {
+  padding-left: 36px;
+}
+.tox:not([dir=rtl]) .tox-color-input span {
+  left: 6px;
+}
+.tox[dir="rtl"] .tox-color-input {
+  /* stylelint-disable-next-line no-descending-specificity */
+}
+.tox[dir="rtl"] .tox-color-input .tox-textfield {
+  padding-right: 36px;
+}
+.tox[dir="rtl"] .tox-color-input span {
+  right: 6px;
+}
+.tox .tox-label,
+.tox .tox-toolbar-label {
+  color: rgba(34, 47, 62, 0.7);
+  display: block;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1.3;
+  padding: 0 8px 0 0;
+  text-transform: none;
+  white-space: nowrap;
+}
+.tox .tox-toolbar-label {
+  padding: 0 8px;
+}
+.tox[dir=rtl] .tox-label {
+  padding: 0 0 0 8px;
+}
+.tox .tox-form {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-form__group {
+  box-sizing: border-box;
+  margin-bottom: 4px;
+}
+.tox .tox-form-group--maximize {
+  flex: 1;
+}
+.tox .tox-form__group--error {
+  color: #c00;
+}
+.tox .tox-form__group--collection {
+  display: flex;
+}
+.tox .tox-form__grid {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.tox .tox-form__grid--2col > .tox-form__group {
+  width: calc(50% - (8px / 2));
+}
+.tox .tox-form__grid--3col > .tox-form__group {
+  width: calc(100% / 3 - (8px / 2));
+}
+.tox .tox-form__grid--4col > .tox-form__group {
+  width: calc(25% - (8px / 2));
+}
+.tox .tox-form__controls-h-stack {
+  align-items: center;
+  display: flex;
+}
+.tox .tox-form__group--inline {
+  align-items: center;
+  display: flex;
+}
+.tox .tox-form__group--stretched {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-form__group--stretched .tox-textarea {
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-form__group--stretched .tox-navobj {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-form__group--stretched .tox-navobj :nth-child(2) {
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  height: 100%;
+}
+.tox:not([dir=rtl]) .tox-form__controls-h-stack > *:not(:first-child) {
+  margin-left: 4px;
+}
+.tox[dir=rtl] .tox-form__controls-h-stack > *:not(:first-child) {
+  margin-right: 4px;
+}
+.tox .tox-lock.tox-locked .tox-lock-icon__unlock,
+.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock {
+  display: none;
+}
+.tox .tox-textfield,
+.tox .tox-toolbar-textfield,
+.tox .tox-listboxfield .tox-listbox--select,
+.tox .tox-textarea {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  background-color: #fff;
+  border-color: #cccccc;
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  box-sizing: border-box;
+  color: #222f3e;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  margin: 0;
+  min-height: 34px;
+  outline: none;
+  padding: 5px 4.75px;
+  resize: none;
+  width: 100%;
+}
+.tox .tox-textfield[disabled],
+.tox .tox-textarea[disabled] {
+  background-color: #f2f2f2;
+  color: rgba(34, 47, 62, 0.85);
+  cursor: not-allowed;
+}
+.tox .tox-textfield:focus,
+.tox .tox-listboxfield .tox-listbox--select:focus,
+.tox .tox-textarea:focus {
+  background-color: #fff;
+  border-color: #207ab7;
+  box-shadow: none;
+  outline: none;
+}
+.tox .tox-toolbar-textfield {
+  border-width: 0;
+  margin-bottom: 3px;
+  margin-top: 2px;
+  max-width: 250px;
+}
+.tox .tox-naked-btn {
+  background-color: transparent;
+  border: 0;
+  border-color: transparent;
+  box-shadow: unset;
+  color: #207ab7;
+  cursor: pointer;
+  display: block;
+  margin: 0;
+  padding: 0;
+}
+.tox .tox-naked-btn svg {
+  display: block;
+  fill: #222f3e;
+}
+.tox:not([dir=rtl]) .tox-toolbar-textfield + * {
+  margin-left: 4px;
+}
+.tox[dir=rtl] .tox-toolbar-textfield + * {
+  margin-right: 4px;
+}
+.tox .tox-listboxfield {
+  cursor: pointer;
+  position: relative;
+}
+.tox .tox-listboxfield .tox-listbox--select[disabled] {
+  background-color: #f2f2f2;
+  color: rgba(34, 47, 62, 0.85);
+  cursor: not-allowed;
+}
+.tox .tox-listbox__select-label {
+  cursor: default;
+  flex: 1;
+  margin: 0 4px;
+}
+.tox .tox-listbox__select-chevron {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  width: 16px;
+}
+.tox .tox-listbox__select-chevron svg {
+  fill: #222f3e;
+}
+.tox .tox-listboxfield .tox-listbox--select {
+  align-items: center;
+  display: flex;
+}
+.tox:not([dir=rtl]) .tox-listboxfield svg {
+  right: 8px;
+}
+.tox[dir=rtl] .tox-listboxfield svg {
+  left: 8px;
+}
+.tox .tox-selectfield {
+  cursor: pointer;
+  position: relative;
+}
+.tox .tox-selectfield select {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  background-color: #fff;
+  border-color: #cccccc;
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  box-sizing: border-box;
+  color: #222f3e;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  margin: 0;
+  min-height: 34px;
+  outline: none;
+  padding: 5px 4.75px;
+  resize: none;
+  width: 100%;
+}
+.tox .tox-selectfield select[disabled] {
+  background-color: #f2f2f2;
+  color: rgba(34, 47, 62, 0.85);
+  cursor: not-allowed;
+}
+.tox .tox-selectfield select::-ms-expand {
+  display: none;
+}
+.tox .tox-selectfield select:focus {
+  background-color: #fff;
+  border-color: #207ab7;
+  box-shadow: none;
+  outline: none;
+}
+.tox .tox-selectfield svg {
+  pointer-events: none;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.tox:not([dir=rtl]) .tox-selectfield select[size="0"],
+.tox:not([dir=rtl]) .tox-selectfield select[size="1"] {
+  padding-right: 24px;
+}
+.tox:not([dir=rtl]) .tox-selectfield svg {
+  right: 8px;
+}
+.tox[dir=rtl] .tox-selectfield select[size="0"],
+.tox[dir=rtl] .tox-selectfield select[size="1"] {
+  padding-left: 24px;
+}
+.tox[dir=rtl] .tox-selectfield svg {
+  left: 8px;
+}
+.tox .tox-textarea {
+  -webkit-appearance: textarea;
+     -moz-appearance: textarea;
+          appearance: textarea;
+  white-space: pre-wrap;
+}
+.tox-fullscreen {
+  border: 0;
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+  -ms-scroll-chaining: none;
+      overscroll-behavior: none;
+  padding: 0;
+  touch-action: pinch-zoom;
+  width: 100%;
+}
+.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle {
+  display: none;
+}
+.tox.tox-tinymce.tox-fullscreen,
+.tox-shadowhost.tox-fullscreen {
+  left: 0;
+  position: fixed;
+  top: 0;
+  z-index: 1200;
+}
+.tox.tox-tinymce.tox-fullscreen {
+  background-color: transparent;
+}
+.tox-fullscreen .tox.tox-tinymce-aux,
+.tox-fullscreen ~ .tox.tox-tinymce-aux {
+  z-index: 1201;
+}
+.tox .tox-help__more-link {
+  list-style: none;
+  margin-top: 1em;
+}
+.tox .tox-image-tools {
+  width: 100%;
+}
+.tox .tox-image-tools__toolbar {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+.tox .tox-image-tools__image {
+  background-color: #666;
+  height: 380px;
+  overflow: auto;
+  position: relative;
+  width: 100%;
+}
+.tox .tox-image-tools__image,
+.tox .tox-image-tools__image + .tox-image-tools__toolbar {
+  margin-top: 8px;
+}
+.tox .tox-image-tools__image-bg {
+  background: url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==);
+}
+.tox .tox-image-tools__toolbar > .tox-spacer {
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-croprect-block {
+  background: black;
+  filter: alpha(opacity=50);
+  opacity: 0.5;
+  position: absolute;
+  zoom: 1;
+}
+.tox .tox-croprect-handle {
+  border: 2px solid white;
+  height: 20px;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 20px;
+}
+.tox .tox-croprect-handle-move {
+  border: 0;
+  cursor: move;
+  position: absolute;
+}
+.tox .tox-croprect-handle-nw {
+  border-width: 2px 0 0 2px;
+  cursor: nw-resize;
+  left: 100px;
+  margin: -2px 0 0 -2px;
+  top: 100px;
+}
+.tox .tox-croprect-handle-ne {
+  border-width: 2px 2px 0 0;
+  cursor: ne-resize;
+  left: 200px;
+  margin: -2px 0 0 -20px;
+  top: 100px;
+}
+.tox .tox-croprect-handle-sw {
+  border-width: 0 0 2px 2px;
+  cursor: sw-resize;
+  left: 100px;
+  margin: -20px 2px 0 -2px;
+  top: 200px;
+}
+.tox .tox-croprect-handle-se {
+  border-width: 0 2px 2px 0;
+  cursor: se-resize;
+  left: 200px;
+  margin: -20px 0 0 -20px;
+  top: 200px;
+}
+.tox:not([dir=rtl]) .tox-image-tools__toolbar > .tox-slider:not(:first-of-type) {
+  margin-left: 8px;
+}
+.tox:not([dir=rtl]) .tox-image-tools__toolbar > .tox-button + .tox-slider {
+  margin-left: 32px;
+}
+.tox:not([dir=rtl]) .tox-image-tools__toolbar > .tox-slider + .tox-button {
+  margin-left: 32px;
+}
+.tox[dir=rtl] .tox-image-tools__toolbar > .tox-slider:not(:first-of-type) {
+  margin-right: 8px;
+}
+.tox[dir=rtl] .tox-image-tools__toolbar > .tox-button + .tox-slider {
+  margin-right: 32px;
+}
+.tox[dir=rtl] .tox-image-tools__toolbar > .tox-slider + .tox-button {
+  margin-right: 32px;
+}
+.tox .tox-insert-table-picker {
+  display: flex;
+  flex-wrap: wrap;
+  width: 170px;
+}
+.tox .tox-insert-table-picker > div {
+  border-color: #cccccc;
+  border-style: solid;
+  border-width: 0 1px 1px 0;
+  box-sizing: border-box;
+  height: 17px;
+  width: 17px;
+}
+.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker {
+  margin: -4px 0;
+}
+.tox .tox-insert-table-picker .tox-insert-table-picker__selected {
+  background-color: rgba(32, 122, 183, 0.5);
+  border-color: rgba(32, 122, 183, 0.5);
+}
+.tox .tox-insert-table-picker__label {
+  color: rgba(34, 47, 62, 0.7);
+  display: block;
+  font-size: 14px;
+  padding: 4px;
+  text-align: center;
+  width: 100%;
+}
+.tox:not([dir=rtl]) {
+  /* stylelint-disable-next-line no-descending-specificity */
+}
+.tox:not([dir=rtl]) .tox-insert-table-picker > div:nth-child(10n) {
+  border-right: 0;
+}
+.tox[dir=rtl] {
+  /* stylelint-disable-next-line no-descending-specificity */
+}
+.tox[dir=rtl] .tox-insert-table-picker > div:nth-child(10n+1) {
+  border-right: 0;
+}
+.tox {
+  /* stylelint-disable */
+  /* stylelint-enable */
+}
+.tox .tox-menu {
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  box-shadow: 0 4px 8px 0 rgba(34, 47, 62, 0.1);
+  display: inline-block;
+  overflow: hidden;
+  vertical-align: top;
+  z-index: 1150;
+}
+.tox .tox-menu.tox-collection.tox-collection--list {
+  padding: 0;
+}
+.tox .tox-menu.tox-collection.tox-collection--toolbar {
+  padding: 4px;
+}
+.tox .tox-menu.tox-collection.tox-collection--grid {
+  padding: 4px;
+}
+.tox .tox-menu__label h1,
+.tox .tox-menu__label h2,
+.tox .tox-menu__label h3,
+.tox .tox-menu__label h4,
+.tox .tox-menu__label h5,
+.tox .tox-menu__label h6,
+.tox .tox-menu__label p,
+.tox .tox-menu__label blockquote,
+.tox .tox-menu__label code {
+  margin: 0;
+}
+.tox .tox-menubar {
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;
+  background-color: #fff;
+  display: flex;
+  flex: 0 0 auto;
+  flex-shrink: 0;
+  flex-wrap: wrap;
+  padding: 0 4px 0 4px;
+}
+.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid #cccccc;
+}
+/* Deprecated. Remove in next major release */
+.tox .tox-mbtn {
+  align-items: center;
+  background: transparent;
+  border: 0;
+  border-radius: 3px;
+  box-shadow: none;
+  color: #222f3e;
+  display: flex;
+  flex: 0 0 auto;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  height: 34px;
+  justify-content: center;
+  margin: 2px 0 3px 0;
+  outline: none;
+  overflow: hidden;
+  padding: 0 4px;
+  text-transform: none;
+  width: auto;
+}
+.tox .tox-mbtn[disabled] {
+  background-color: transparent;
+  border: 0;
+  box-shadow: none;
+  color: rgba(34, 47, 62, 0.5);
+  cursor: not-allowed;
+}
+.tox .tox-mbtn:focus:not(:disabled) {
+  background: #dee0e2;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-mbtn--active {
+  background: #c8cbcf;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active) {
+  background: #dee0e2;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-mbtn__select-label {
+  cursor: default;
+  font-weight: normal;
+  margin: 0 4px;
+}
+.tox .tox-mbtn[disabled] .tox-mbtn__select-label {
+  cursor: not-allowed;
+}
+.tox .tox-mbtn__select-chevron {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  width: 16px;
+  display: none;
+}
+.tox .tox-notification {
+  border-radius: 3px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  box-sizing: border-box;
+  display: -ms-grid;
+  display: grid;
+  font-size: 14px;
+  font-weight: normal;
+  -ms-grid-columns: minmax(40px, 1fr) auto minmax(40px, 1fr);
+      grid-template-columns: minmax(40px, 1fr) auto minmax(40px, 1fr);
+  margin-top: 4px;
+  opacity: 0;
+  padding: 4px;
+  transition: transform 100ms ease-in, opacity 150ms ease-in;
+}
+.tox .tox-notification p {
+  font-size: 14px;
+  font-weight: normal;
+}
+.tox .tox-notification a {
+  cursor: pointer;
+  text-decoration: underline;
+}
+.tox .tox-notification--in {
+  opacity: 1;
+}
+.tox .tox-notification--success {
+  background-color: #e4eeda;
+  border-color: #d7e6c8;
+  color: #222f3e;
+}
+.tox .tox-notification--success p {
+  color: #222f3e;
+}
+.tox .tox-notification--success a {
+  color: #547831;
+}
+.tox .tox-notification--success svg {
+  fill: #222f3e;
+}
+.tox .tox-notification--error {
+  background-color: #f8dede;
+  border-color: #f2bfbf;
+  color: #222f3e;
+}
+.tox .tox-notification--error p {
+  color: #222f3e;
+}
+.tox .tox-notification--error a {
+  color: #c00;
+}
+.tox .tox-notification--error svg {
+  fill: #222f3e;
+}
+.tox .tox-notification--warn,
+.tox .tox-notification--warning {
+  background-color: #fffaea;
+  border-color: #ffe89d;
+  color: #222f3e;
+}
+.tox .tox-notification--warn p,
+.tox .tox-notification--warning p {
+  color: #222f3e;
+}
+.tox .tox-notification--warn a,
+.tox .tox-notification--warning a {
+  color: #222f3e;
+}
+.tox .tox-notification--warn svg,
+.tox .tox-notification--warning svg {
+  fill: #222f3e;
+}
+.tox .tox-notification--info {
+  background-color: #d9edf7;
+  border-color: #779ecb;
+  color: #222f3e;
+}
+.tox .tox-notification--info p {
+  color: #222f3e;
+}
+.tox .tox-notification--info a {
+  color: #222f3e;
+}
+.tox .tox-notification--info svg {
+  fill: #222f3e;
+}
+.tox .tox-notification__body {
+  -ms-grid-row-align: center;
+      align-self: center;
+  color: #222f3e;
+  font-size: 14px;
+  -ms-grid-column-span: 1;
+  grid-column-end: 3;
+  -ms-grid-column: 2;
+      grid-column-start: 2;
+  -ms-grid-row-span: 1;
+  grid-row-end: 2;
+  -ms-grid-row: 1;
+      grid-row-start: 1;
+  text-align: center;
+  white-space: normal;
+  word-break: break-all;
+  word-break: break-word;
+}
+.tox .tox-notification__body > * {
+  margin: 0;
+}
+.tox .tox-notification__body > * + * {
+  margin-top: 1rem;
+}
+.tox .tox-notification__icon {
+  -ms-grid-row-align: center;
+      align-self: center;
+  -ms-grid-column-span: 1;
+  grid-column-end: 2;
+  -ms-grid-column: 1;
+      grid-column-start: 1;
+  -ms-grid-row-span: 1;
+  grid-row-end: 2;
+  -ms-grid-row: 1;
+      grid-row-start: 1;
+  -ms-grid-column-align: end;
+      justify-self: end;
+}
+.tox .tox-notification__icon svg {
+  display: block;
+}
+.tox .tox-notification__dismiss {
+  -ms-grid-row-align: start;
+      align-self: start;
+  -ms-grid-column-span: 1;
+  grid-column-end: 4;
+  -ms-grid-column: 3;
+      grid-column-start: 3;
+  -ms-grid-row-span: 1;
+  grid-row-end: 2;
+  -ms-grid-row: 1;
+      grid-row-start: 1;
+  -ms-grid-column-align: end;
+      justify-self: end;
+}
+.tox .tox-notification .tox-progress-bar {
+  -ms-grid-column-span: 3;
+  grid-column-end: 4;
+  -ms-grid-column: 1;
+      grid-column-start: 1;
+  -ms-grid-row-span: 1;
+  grid-row-end: 3;
+  -ms-grid-row: 2;
+      grid-row-start: 2;
+  -ms-grid-column-align: center;
+      justify-self: center;
+}
+.tox .tox-pop {
+  display: inline-block;
+  position: relative;
+}
+.tox .tox-pop--resizing {
+  transition: width 0.1s ease;
+}
+.tox .tox-pop--resizing .tox-toolbar,
+.tox .tox-pop--resizing .tox-toolbar__group {
+  flex-wrap: nowrap;
+}
+.tox .tox-pop--transition {
+  transition: 0.15s ease;
+  transition-property: left, right, top, bottom;
+}
+.tox .tox-pop--transition::before,
+.tox .tox-pop--transition::after {
+  transition: all 0.15s, visibility 0s, opacity 0.075s ease 0.075s;
+}
+.tox .tox-pop__dialog {
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+  min-width: 0;
+  overflow: hidden;
+}
+.tox .tox-pop__dialog > *:not(.tox-toolbar) {
+  margin: 4px 4px 4px 8px;
+}
+.tox .tox-pop__dialog .tox-toolbar {
+  background-color: transparent;
+  margin-bottom: -1px;
+}
+.tox .tox-pop::before,
+.tox .tox-pop::after {
+  border-style: solid;
+  content: '';
+  display: block;
+  height: 0;
+  opacity: 1;
+  position: absolute;
+  width: 0;
+}
+.tox .tox-pop.tox-pop--inset::before,
+.tox .tox-pop.tox-pop--inset::after {
+  opacity: 0;
+  transition: all 0s 0.15s, visibility 0s, opacity 0.075s ease;
+}
+.tox .tox-pop.tox-pop--bottom::before,
+.tox .tox-pop.tox-pop--bottom::after {
+  left: 50%;
+  top: 100%;
+}
+.tox .tox-pop.tox-pop--bottom::after {
+  border-color: #fff transparent transparent transparent;
+  border-width: 8px;
+  margin-left: -8px;
+  margin-top: -1px;
+}
+.tox .tox-pop.tox-pop--bottom::before {
+  border-color: #cccccc transparent transparent transparent;
+  border-width: 9px;
+  margin-left: -9px;
+}
+.tox .tox-pop.tox-pop--top::before,
+.tox .tox-pop.tox-pop--top::after {
+  left: 50%;
+  top: 0;
+  transform: translateY(-100%);
+}
+.tox .tox-pop.tox-pop--top::after {
+  border-color: transparent transparent #fff transparent;
+  border-width: 8px;
+  margin-left: -8px;
+  margin-top: 1px;
+}
+.tox .tox-pop.tox-pop--top::before {
+  border-color: transparent transparent #cccccc transparent;
+  border-width: 9px;
+  margin-left: -9px;
+}
+.tox .tox-pop.tox-pop--left::before,
+.tox .tox-pop.tox-pop--left::after {
+  left: 0;
+  top: calc(50% - 1px);
+  transform: translateY(-50%);
+}
+.tox .tox-pop.tox-pop--left::after {
+  border-color: transparent #fff transparent transparent;
+  border-width: 8px;
+  margin-left: -15px;
+}
+.tox .tox-pop.tox-pop--left::before {
+  border-color: transparent #cccccc transparent transparent;
+  border-width: 10px;
+  margin-left: -19px;
+}
+.tox .tox-pop.tox-pop--right::before,
+.tox .tox-pop.tox-pop--right::after {
+  left: 100%;
+  top: calc(50% + 1px);
+  transform: translateY(-50%);
+}
+.tox .tox-pop.tox-pop--right::after {
+  border-color: transparent transparent transparent #fff;
+  border-width: 8px;
+  margin-left: -1px;
+}
+.tox .tox-pop.tox-pop--right::before {
+  border-color: transparent transparent transparent #cccccc;
+  border-width: 10px;
+  margin-left: -1px;
+}
+.tox .tox-pop.tox-pop--align-left::before,
+.tox .tox-pop.tox-pop--align-left::after {
+  left: 20px;
+}
+.tox .tox-pop.tox-pop--align-right::before,
+.tox .tox-pop.tox-pop--align-right::after {
+  left: calc(100% - 20px);
+}
+.tox .tox-sidebar-wrap {
+  display: flex;
+  flex-direction: row;
+  flex-grow: 1;
+  -ms-flex-preferred-size: 0;
+  min-height: 0;
+}
+.tox .tox-sidebar {
+  background-color: #fff;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+.tox .tox-sidebar__slider {
+  display: flex;
+  overflow: hidden;
+}
+.tox .tox-sidebar__pane-container {
+  display: flex;
+}
+.tox .tox-sidebar__pane {
+  display: flex;
+}
+.tox .tox-sidebar--sliding-closed {
+  opacity: 0;
+}
+.tox .tox-sidebar--sliding-open {
+  opacity: 1;
+}
+.tox .tox-sidebar--sliding-growing,
+.tox .tox-sidebar--sliding-shrinking {
+  transition: width 0.5s ease, opacity 0.5s ease;
+}
+.tox .tox-selector {
+  background-color: #4099ff;
+  border-color: #4099ff;
+  border-style: solid;
+  border-width: 1px;
+  box-sizing: border-box;
+  display: inline-block;
+  height: 10px;
+  position: absolute;
+  width: 10px;
+}
+.tox.tox-platform-touch .tox-selector {
+  height: 12px;
+  width: 12px;
+}
+.tox .tox-slider {
+  align-items: center;
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+  height: 24px;
+  justify-content: center;
+  position: relative;
+}
+.tox .tox-slider__rail {
+  background-color: transparent;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  height: 10px;
+  min-width: 120px;
+  width: 100%;
+}
+.tox .tox-slider__handle {
+  background-color: #207ab7;
+  border: 2px solid #185d8c;
+  border-radius: 3px;
+  box-shadow: none;
+  height: 24px;
+  left: 50%;
+  position: absolute;
+  top: 50%;
+  transform: translateX(-50%) translateY(-50%);
+  width: 14px;
+}
+.tox .tox-source-code {
+  overflow: auto;
+}
+.tox .tox-spinner {
+  display: flex;
+}
+.tox .tox-spinner > div {
+  animation: tam-bouncing-dots 1.5s ease-in-out 0s infinite both;
+  background-color: rgba(34, 47, 62, 0.7);
+  border-radius: 100%;
+  height: 8px;
+  width: 8px;
+}
+.tox .tox-spinner > div:nth-child(1) {
+  animation-delay: -0.32s;
+}
+.tox .tox-spinner > div:nth-child(2) {
+  animation-delay: -0.16s;
+}
+@keyframes tam-bouncing-dots {
+  0%,
+  80%,
+  100% {
+    transform: scale(0);
+  }
+  40% {
+    transform: scale(1);
+  }
+}
+.tox:not([dir=rtl]) .tox-spinner > div:not(:first-child) {
+  margin-left: 4px;
+}
+.tox[dir=rtl] .tox-spinner > div:not(:first-child) {
+  margin-right: 4px;
+}
+.tox .tox-statusbar {
+  align-items: center;
+  background-color: #fff;
+  border-top: 1px solid #cccccc;
+  color: rgba(34, 47, 62, 0.7);
+  display: flex;
+  flex: 0 0 auto;
+  font-size: 12px;
+  font-weight: normal;
+  height: 18px;
+  overflow: hidden;
+  padding: 0 8px;
+  position: relative;
+  text-transform: uppercase;
+}
+.tox .tox-statusbar__text-container {
+  display: flex;
+  flex: 1 1 auto;
+  justify-content: flex-end;
+  overflow: hidden;
+}
+.tox .tox-statusbar__path {
+  display: flex;
+  flex: 1 1 auto;
+  margin-right: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.tox .tox-statusbar__path > * {
+  display: inline;
+  white-space: nowrap;
+}
+.tox .tox-statusbar__wordcount {
+  flex: 0 0 auto;
+  margin-left: 1ch;
+}
+.tox .tox-statusbar a,
+.tox .tox-statusbar__path-item,
+.tox .tox-statusbar__wordcount {
+  color: rgba(34, 47, 62, 0.7);
+  text-decoration: none;
+}
+.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),
+.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),
+.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]),
+.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),
+.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),
+.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+.tox .tox-statusbar__resize-handle {
+  align-items: flex-end;
+  align-self: stretch;
+  cursor: nwse-resize;
+  display: flex;
+  flex: 0 0 auto;
+  justify-content: flex-end;
+  margin-left: auto;
+  margin-right: -8px;
+  padding-left: 1ch;
+}
+.tox .tox-statusbar__resize-handle svg {
+  display: block;
+  fill: rgba(34, 47, 62, 0.7);
+}
+.tox .tox-statusbar__resize-handle:focus svg {
+  background-color: #dee0e2;
+  border-radius: 1px;
+  box-shadow: 0 0 0 2px #dee0e2;
+}
+.tox:not([dir=rtl]) .tox-statusbar__path > * {
+  margin-right: 4px;
+}
+.tox:not([dir=rtl]) .tox-statusbar__branding {
+  margin-left: 1ch;
+}
+.tox[dir=rtl] .tox-statusbar {
+  flex-direction: row-reverse;
+}
+.tox[dir=rtl] .tox-statusbar__path > * {
+  margin-left: 4px;
+}
+.tox .tox-throbber {
+  z-index: 1299;
+}
+.tox .tox-throbber__busy-spinner {
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.6);
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+.tox .tox-tbtn {
+  align-items: center;
+  background: transparent;
+  border: 0;
+  border-radius: 3px;
+  box-shadow: none;
+  color: #222f3e;
+  display: flex;
+  flex: 0 0 auto;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  height: 34px;
+  justify-content: center;
+  margin: 2px 0 3px 0;
+  outline: none;
+  overflow: hidden;
+  padding: 0;
+  text-transform: none;
+  width: 34px;
+}
+.tox .tox-tbtn svg {
+  display: block;
+  fill: #222f3e;
+}
+.tox .tox-tbtn.tox-tbtn-more {
+  padding-left: 5px;
+  padding-right: 5px;
+  width: inherit;
+}
+.tox .tox-tbtn:focus {
+  background: #dee0e2;
+  border: 0;
+  box-shadow: none;
+}
+.tox .tox-tbtn:hover {
+  background: #dee0e2;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-tbtn:hover svg {
+  fill: #222f3e;
+}
+.tox .tox-tbtn:active {
+  background: #c8cbcf;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-tbtn:active svg {
+  fill: #222f3e;
+}
+.tox .tox-tbtn--disabled,
+.tox .tox-tbtn--disabled:hover,
+.tox .tox-tbtn:disabled,
+.tox .tox-tbtn:disabled:hover {
+  background: transparent;
+  border: 0;
+  box-shadow: none;
+  color: rgba(34, 47, 62, 0.5);
+  cursor: not-allowed;
+}
+.tox .tox-tbtn--disabled svg,
+.tox .tox-tbtn--disabled:hover svg,
+.tox .tox-tbtn:disabled svg,
+.tox .tox-tbtn:disabled:hover svg {
+  /* stylelint-disable-line no-descending-specificity */
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-tbtn--enabled,
+.tox .tox-tbtn--enabled:hover {
+  background: #c8cbcf;
+  border: 0;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-tbtn--enabled > *,
+.tox .tox-tbtn--enabled:hover > * {
+  transform: none;
+}
+.tox .tox-tbtn--enabled svg,
+.tox .tox-tbtn--enabled:hover svg {
+  /* stylelint-disable-line no-descending-specificity */
+  fill: #222f3e;
+}
+.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) {
+  color: #222f3e;
+}
+.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg {
+  fill: #222f3e;
+}
+.tox .tox-tbtn:active > * {
+  transform: none;
+}
+.tox .tox-tbtn--md {
+  height: 51px;
+  width: 51px;
+}
+.tox .tox-tbtn--lg {
+  flex-direction: column;
+  height: 68px;
+  width: 68px;
+}
+.tox .tox-tbtn--return {
+  -ms-grid-row-align: stretch;
+      align-self: stretch;
+  height: unset;
+  width: 16px;
+}
+.tox .tox-tbtn--labeled {
+  padding: 0 4px;
+  width: unset;
+}
+.tox .tox-tbtn__vlabel {
+  display: block;
+  font-size: 10px;
+  font-weight: normal;
+  letter-spacing: -0.025em;
+  margin-bottom: 4px;
+  white-space: nowrap;
+}
+.tox .tox-tbtn--select {
+  margin: 2px 0 3px 0;
+  padding: 0 4px;
+  width: auto;
+}
+.tox .tox-tbtn__select-label {
+  cursor: default;
+  font-weight: normal;
+  margin: 0 4px;
+}
+.tox .tox-tbtn__select-chevron {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  width: 16px;
+}
+.tox .tox-tbtn__select-chevron svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-tbtn--bespoke .tox-tbtn__select-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 7em;
+}
+.tox .tox-split-button {
+  border: 0;
+  border-radius: 3px;
+  box-sizing: border-box;
+  display: flex;
+  margin: 2px 0 3px 0;
+  overflow: hidden;
+}
+.tox .tox-split-button:hover {
+  box-shadow: 0 0 0 1px #dee0e2 inset;
+}
+.tox .tox-split-button:focus {
+  background: #dee0e2;
+  box-shadow: none;
+  color: #222f3e;
+}
+.tox .tox-split-button > * {
+  border-radius: 0;
+}
+.tox .tox-split-button__chevron {
+  width: 16px;
+}
+.tox .tox-split-button__chevron svg {
+  fill: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-split-button .tox-tbtn {
+  margin: 0;
+}
+.tox.tox-platform-touch .tox-split-button .tox-tbtn:first-child {
+  width: 30px;
+}
+.tox.tox-platform-touch .tox-split-button__chevron {
+  width: 20px;
+}
+.tox .tox-split-button.tox-tbtn--disabled:hover,
+.tox .tox-split-button.tox-tbtn--disabled:focus,
+.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,
+.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus {
+  background: transparent;
+  box-shadow: none;
+  color: rgba(34, 47, 62, 0.5);
+}
+.tox .tox-toolbar-overlord {
+  background-color: #fff;
+}
+.tox .tox-toolbar,
+.tox .tox-toolbar__primary,
+.tox .tox-toolbar__overflow {
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;
+  background-color: #fff;
+  display: flex;
+  flex: 0 0 auto;
+  flex-shrink: 0;
+  flex-wrap: wrap;
+  padding: 0 0;
+}
+.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed {
+  height: 0;
+  opacity: 0;
+  padding-bottom: 0;
+  padding-top: 0;
+  visibility: hidden;
+}
+.tox .tox-toolbar__overflow--growing {
+  transition: height 0.3s ease, opacity 0.2s linear 0.1s;
+}
+.tox .tox-toolbar__overflow--shrinking {
+  transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
+}
+.tox .tox-menubar + .tox-toolbar,
+.tox .tox-menubar + .tox-toolbar-overlord .tox-toolbar__primary {
+  border-top: 1px solid #cccccc;
+  margin-top: -1px;
+}
+.tox .tox-toolbar--scrolling {
+  flex-wrap: nowrap;
+  overflow-x: auto;
+}
+.tox .tox-pop .tox-toolbar {
+  border-width: 0;
+}
+.tox .tox-toolbar--no-divider {
+  background-image: none;
+}
+.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child,
+.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary {
+  border-top: 1px solid #cccccc;
+}
+.tox.tox-tinymce-aux .tox-toolbar__overflow {
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+}
+.tox .tox-toolbar__group {
+  align-items: center;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 0;
+  padding: 0 4px 0 4px;
+}
+.tox .tox-toolbar__group--pull-right {
+  margin-left: auto;
+}
+.tox .tox-toolbar--scrolling .tox-toolbar__group {
+  flex-shrink: 0;
+  flex-wrap: nowrap;
+}
+.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type) {
+  border-right: 1px solid #cccccc;
+}
+.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type) {
+  border-left: 1px solid #cccccc;
+}
+.tox .tox-tooltip {
+  display: inline-block;
+  padding: 8px;
+  position: relative;
+}
+.tox .tox-tooltip__body {
+  background-color: #222f3e;
+  border-radius: 3px;
+  box-shadow: 0 2px 4px rgba(34, 47, 62, 0.3);
+  color: rgba(255, 255, 255, 0.75);
+  font-size: 14px;
+  font-style: normal;
+  font-weight: normal;
+  padding: 4px 8px;
+  text-transform: none;
+}
+.tox .tox-tooltip__arrow {
+  position: absolute;
+}
+.tox .tox-tooltip--down .tox-tooltip__arrow {
+  border-left: 8px solid transparent;
+  border-right: 8px solid transparent;
+  border-top: 8px solid #222f3e;
+  bottom: 0;
+  left: 50%;
+  position: absolute;
+  transform: translateX(-50%);
+}
+.tox .tox-tooltip--up .tox-tooltip__arrow {
+  border-bottom: 8px solid #222f3e;
+  border-left: 8px solid transparent;
+  border-right: 8px solid transparent;
+  left: 50%;
+  position: absolute;
+  top: 0;
+  transform: translateX(-50%);
+}
+.tox .tox-tooltip--right .tox-tooltip__arrow {
+  border-bottom: 8px solid transparent;
+  border-left: 8px solid #222f3e;
+  border-top: 8px solid transparent;
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.tox .tox-tooltip--left .tox-tooltip__arrow {
+  border-bottom: 8px solid transparent;
+  border-right: 8px solid #222f3e;
+  border-top: 8px solid transparent;
+  left: 0;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.tox .tox-well {
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  padding: 8px;
+  width: 100%;
+}
+.tox .tox-well > *:first-child {
+  margin-top: 0;
+}
+.tox .tox-well > *:last-child {
+  margin-bottom: 0;
+}
+.tox .tox-well > *:only-child {
+  margin: 0;
+}
+.tox .tox-custom-editor {
+  border: 1px solid #cccccc;
+  border-radius: 3px;
+  display: flex;
+  flex: 1;
+  position: relative;
+}
+/* stylelint-disable */
+.tox {
+  /* stylelint-enable */
+}
+.tox .tox-dialog-loading::before {
+  background-color: rgba(0, 0, 0, 0.5);
+  content: "";
+  height: 100%;
+  position: absolute;
+  width: 100%;
+  z-index: 1000;
+}
+.tox .tox-tab {
+  cursor: pointer;
+}
+.tox .tox-dialog__content-js {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-dialog__body-content .tox-collection {
+  display: flex;
+  flex: 1;
+  -ms-flex-preferred-size: auto;
+}
+.tox .tox-image-tools-edit-panel {
+  height: 60px;
+}
+.tox .tox-image-tools__sidebar {
+  height: 60px;
+}
diff --git a/public/tinymce/skins/oxide/skin.min.css b/public/tinymce/skins/oxide/skin.min.css
new file mode 100644
index 0000000000..f570b8e49f
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox-tinymce-inline{border:none;box-shadow:none}.tox-tinymce-inline .tox-editor-header{background-color:transparent;border:1px solid #ccc;border-radius:0;box-shadow:none}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border:1px solid #ccc;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>:last-child:not(:only-child){border-color:#ccc;border-style:solid}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(32,122,183,.1);border-color:rgba(32,122,183,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description>:last-child{border-color:rgba(32,122,183,.4)}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a .tox-icon{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.1);border-color:rgba(255,165,0,.5);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description>:last-child{border-color:rgba(255,165,0,.5)}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--warn a .tox-icon{color:#cc8500}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);border-color:rgba(204,0,0,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description>:last-child{border-color:rgba(204,0,0,.4)}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a .tox-icon{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);border-color:rgba(120,171,70,.4);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{border-color:rgba(120,171,70,.4)}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#78ab46}.tox .tox-dialog__body-content .accessibility-issue--success a .tox-icon{color:#78ab46}.tox .tox-dialog__body-content .accessibility-issue__header h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description>:last-child{border-left-width:1px;padding-left:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description>:last-child{border-right-width:1px;padding-right:4px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;color:#222f3e;cursor:pointer;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;-ms-flex-preferred-size:auto;font-size:14px;font-style:normal;font-weight:400;line-height:24px;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:2px 0 3px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{-ms-grid-row-align:center;align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{-ms-grid-row-align:center;align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:rgba(34,47,62,.7);font-size:12px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__name{color:rgba(34,47,62,.7);font-size:12px;font-style:normal;font-weight:700;text-transform:uppercase}.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;-ms-flex-preferred-size:auto;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;padding:16px 16px}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;font-size:14px;line-height:1.3;margin-bottom:8px;text-decoration:none;white-space:nowrap}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto;max-height:650px;overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:none}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content a:active{color:#185d8c;text-decoration:none}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content ul{display:block;list-style-type:disc;margin-bottom:16px;-webkit-margin-end:0;margin-inline-end:0;-webkit-margin-start:0;margin-inline-start:0;-webkit-padding-start:2.5rem;padding-inline-start:2.5rem}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #ccc}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}.tox.tox-platform-ie .tox-dialog-wrap{position:-ms-device-fixed}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;-ms-flex-preferred-size:auto;overflow:hidden;position:relative}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;-ms-flex-preferred-size:auto;height:100%;position:absolute;width:100%}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{z-index:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{box-shadow:none;transition:box-shadow .5s}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-textarea{flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;-ms-flex-preferred-size:auto;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-image-tools{width:100%}.tox .tox-image-tools__toolbar{align-items:center;display:flex;justify-content:center}.tox .tox-image-tools__image{background-color:#666;height:380px;overflow:auto;position:relative;width:100%}.tox .tox-image-tools__image,.tox .tox-image-tools__image+.tox-image-tools__toolbar{margin-top:8px}.tox .tox-image-tools__image-bg{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools__toolbar>.tox-spacer{flex:1;-ms-flex-preferred-size:auto}.tox .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-left:8px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-left:32px}.tox:not([dir=rtl]) .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-left:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider:not(:first-of-type){margin-right:8px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-button+.tox-slider{margin-right:32px}.tox[dir=rtl] .tox-image-tools__toolbar>.tox-slider+.tox-button{margin-right:32px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 4px 0 4px}.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:-ms-grid;display:grid;font-size:14px;font-weight:400;-ms-grid-columns:minmax(40px,1fr) auto minmax(40px,1fr);grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#547831}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f8dede;border-color:#f2bfbf;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#c00}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fffaea;border-color:#ffe89d;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#222f3e}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d9edf7;border-color:#779ecb;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#222f3e}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{-ms-grid-row-align:center;align-self:center;color:#222f3e;font-size:14px;-ms-grid-column-span:1;grid-column-end:3;-ms-grid-column:2;grid-column-start:2;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{-ms-grid-row-align:center;align-self:center;-ms-grid-column-span:1;grid-column-end:2;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{-ms-grid-row-align:start;align-self:start;-ms-grid-column-span:1;grid-column-end:4;-ms-grid-column:3;grid-column-start:3;-ms-grid-row-span:1;grid-row-end:2;-ms-grid-row:1;grid-row-start:1;-ms-grid-column-align:end;justify-self:end}.tox .tox-notification .tox-progress-bar{-ms-grid-column-span:3;grid-column-end:4;-ms-grid-column:1;grid-column-start:1;-ms-grid-row-span:1;grid-row-end:3;-ms-grid-row:2;grid-row-start:2;-ms-grid-column-align:center;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;-ms-flex-preferred-size:0;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;-ms-flex-preferred-size:auto;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:flex-end;overflow:hidden}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;margin-right:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){cursor:pointer;text-decoration:underline}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-left:1ch}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.7)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{-ms-grid-row-align:stretch;align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tbtn--select{margin:2px 0 3px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:2px 0 3px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.15)}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1;-ms-flex-preferred-size:auto}.tox .tox-image-tools-edit-panel{height:60px}.tox .tox-image-tools__sidebar{height:60px}
diff --git a/public/tinymce/skins/oxide/skin.mobile.css b/public/tinymce/skins/oxide/skin.mobile.css
new file mode 100644
index 0000000000..875721a27d
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.mobile.css
@@ -0,0 +1,673 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+/* RESET all the things! */
+.tinymce-mobile-outer-container {
+  all: initial;
+  display: block;
+}
+.tinymce-mobile-outer-container * {
+  border: 0;
+  box-sizing: initial;
+  cursor: inherit;
+  float: none;
+  line-height: 1;
+  margin: 0;
+  outline: 0;
+  padding: 0;
+  -webkit-tap-highlight-color: transparent;
+  /* TBIO-3691, stop the gray flicker on touch. */
+  text-shadow: none;
+  white-space: nowrap;
+}
+.tinymce-mobile-icon-arrow-back::before {
+  content: "\e5cd";
+}
+.tinymce-mobile-icon-image::before {
+  content: "\e412";
+}
+.tinymce-mobile-icon-cancel-circle::before {
+  content: "\e5c9";
+}
+.tinymce-mobile-icon-full-dot::before {
+  content: "\e061";
+}
+.tinymce-mobile-icon-align-center::before {
+  content: "\e234";
+}
+.tinymce-mobile-icon-align-left::before {
+  content: "\e236";
+}
+.tinymce-mobile-icon-align-right::before {
+  content: "\e237";
+}
+.tinymce-mobile-icon-bold::before {
+  content: "\e238";
+}
+.tinymce-mobile-icon-italic::before {
+  content: "\e23f";
+}
+.tinymce-mobile-icon-unordered-list::before {
+  content: "\e241";
+}
+.tinymce-mobile-icon-ordered-list::before {
+  content: "\e242";
+}
+.tinymce-mobile-icon-font-size::before {
+  content: "\e245";
+}
+.tinymce-mobile-icon-underline::before {
+  content: "\e249";
+}
+.tinymce-mobile-icon-link::before {
+  content: "\e157";
+}
+.tinymce-mobile-icon-unlink::before {
+  content: "\eca2";
+}
+.tinymce-mobile-icon-color::before {
+  content: "\e891";
+}
+.tinymce-mobile-icon-previous::before {
+  content: "\e314";
+}
+.tinymce-mobile-icon-next::before {
+  content: "\e315";
+}
+.tinymce-mobile-icon-large-font::before,
+.tinymce-mobile-icon-style-formats::before {
+  content: "\e264";
+}
+.tinymce-mobile-icon-undo::before {
+  content: "\e166";
+}
+.tinymce-mobile-icon-redo::before {
+  content: "\e15a";
+}
+.tinymce-mobile-icon-removeformat::before {
+  content: "\e239";
+}
+.tinymce-mobile-icon-small-font::before {
+  content: "\e906";
+}
+.tinymce-mobile-icon-readonly-back::before,
+.tinymce-mobile-format-matches::after {
+  content: "\e5ca";
+}
+.tinymce-mobile-icon-small-heading::before {
+  content: "small";
+}
+.tinymce-mobile-icon-large-heading::before {
+  content: "large";
+}
+.tinymce-mobile-icon-small-heading::before,
+.tinymce-mobile-icon-large-heading::before {
+  font-family: sans-serif;
+  font-size: 80%;
+}
+.tinymce-mobile-mask-edit-icon::before {
+  content: "\e254";
+}
+.tinymce-mobile-icon-back::before {
+  content: "\e5c4";
+}
+.tinymce-mobile-icon-heading::before {
+  /* TODO: Translate */
+  content: "Headings";
+  font-family: sans-serif;
+  font-size: 80%;
+  font-weight: bold;
+}
+.tinymce-mobile-icon-h1::before {
+  content: "H1";
+  font-weight: bold;
+}
+.tinymce-mobile-icon-h2::before {
+  content: "H2";
+  font-weight: bold;
+}
+.tinymce-mobile-icon-h3::before {
+  content: "H3";
+  font-weight: bold;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  background: rgba(51, 51, 51, 0.5);
+  height: 100%;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container {
+  align-items: center;
+  border-radius: 50%;
+  display: flex;
+  flex-direction: column;
+  font-family: sans-serif;
+  font-size: 1em;
+  justify-content: space-between;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  border-radius: 50%;
+  height: 2.1em;
+  width: 2.1em;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  font-size: 1em;
+}
+@media only screen and (min-device-width:700px) {
+  .tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
+    font-size: 1.2em;
+  }
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  border-radius: 50%;
+  height: 2.1em;
+  width: 2.1em;
+  background-color: white;
+  color: #207ab7;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before {
+  content: "\e900";
+  font-family: 'tinymce-mobile', sans-serif;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon {
+  z-index: 2;
+}
+.tinymce-mobile-android-container.tinymce-mobile-android-maximized {
+  background: #ffffff;
+  border: none;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  left: 0;
+  position: fixed;
+  right: 0;
+  top: 0;
+}
+.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized) {
+  position: relative;
+}
+.tinymce-mobile-android-container .tinymce-mobile-editor-socket {
+  display: flex;
+  flex-grow: 1;
+}
+.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe {
+  display: flex !important;
+  flex-grow: 1;
+  height: auto !important;
+}
+.tinymce-mobile-android-scroll-reload {
+  overflow: hidden;
+}
+:not(.tinymce-mobile-readonly-mode) > .tinymce-mobile-android-selection-context-toolbar {
+  margin-top: 23px;
+}
+.tinymce-mobile-toolstrip {
+  background: #fff;
+  display: flex;
+  flex: 0 0 auto;
+  z-index: 1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar {
+  align-items: center;
+  background-color: #fff;
+  border-bottom: 1px solid #cccccc;
+  display: flex;
+  flex: 1;
+  height: 2.5em;
+  width: 100%;
+  /* Make it no larger than the toolstrip, so that it needs to scroll */
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  flex-shrink: 1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group > div {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  flex: 1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container {
+  background: #f44336;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group {
+  flex-grow: 1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button {
+  align-items: center;
+  display: flex;
+  height: 80%;
+  margin-left: 2px;
+  margin-right: 2px;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected {
+  background: #c8cbcf;
+  color: #cccccc;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type {
+  background: #207ab7;
+  color: #eceff1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar {
+  /* Note, this file is imported inside .tinymce-mobile-context-toolbar, so that prefix is on everything here. */
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  flex: 1;
+  padding-bottom: 0.4em;
+  padding-top: 0.4em;
+  /* Make any buttons appearing on the left and right display in the centre (e.g. color edges) */
+  /* For widgets like the colour picker, use the whole height */
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog {
+  display: flex;
+  min-height: 1.5em;
+  overflow: hidden;
+  padding-left: 0;
+  padding-right: 0;
+  position: relative;
+  width: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain {
+  display: flex;
+  height: 100%;
+  transition: left cubic-bezier(0.4, 0, 1, 1) 0.15s;
+  width: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen {
+  display: flex;
+  flex: 0 0 auto;
+  justify-content: space-between;
+  width: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input {
+  font-family: Sans-serif;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container {
+  display: flex;
+  flex-grow: 1;
+  position: relative;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x {
+  -ms-grid-row-align: center;
+      align-self: center;
+  background: inherit;
+  border: none;
+  border-radius: 50%;
+  color: #888;
+  font-size: 0.6em;
+  font-weight: bold;
+  height: 100%;
+  padding-right: 2px;
+  position: absolute;
+  right: 0;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x {
+  display: none;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next {
+  align-items: center;
+  display: flex;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before {
+  align-items: center;
+  display: flex;
+  font-weight: bold;
+  height: 100%;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before {
+  visibility: hidden;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item {
+  color: #cccccc;
+  font-size: 10px;
+  line-height: 10px;
+  margin: 0 2px;
+  padding-top: 3px;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active {
+  color: #c8cbcf;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before {
+  margin-left: 0.5em;
+  margin-right: 0.9em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before {
+  margin-left: 0.9em;
+  margin-right: 0.5em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider {
+  display: flex;
+  flex: 1;
+  margin-left: 0;
+  margin-right: 0;
+  padding: 0.28em 0;
+  position: relative;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container {
+  align-items: center;
+  display: flex;
+  flex-grow: 1;
+  height: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line {
+  background: #cccccc;
+  display: flex;
+  flex: 1;
+  height: 0.2em;
+  margin-bottom: 0.3em;
+  margin-top: 0.3em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container {
+  padding-left: 2em;
+  padding-right: 2em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container {
+  align-items: center;
+  display: flex;
+  flex-grow: 1;
+  height: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient {
+  background: linear-gradient(to right, hsl(0, 100%, 50%) 0%, hsl(60, 100%, 50%) 17%, hsl(120, 100%, 50%) 33%, hsl(180, 100%, 50%) 50%, hsl(240, 100%, 50%) 67%, hsl(300, 100%, 50%) 83%, hsl(0, 100%, 50%) 100%);
+  display: flex;
+  flex: 1;
+  height: 0.2em;
+  margin-bottom: 0.3em;
+  margin-top: 0.3em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black {
+  /* Not part of theming */
+  background: black;
+  height: 0.2em;
+  margin-bottom: 0.3em;
+  margin-top: 0.3em;
+  width: 1.2em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white {
+  /* Not part of theming */
+  background: white;
+  height: 0.2em;
+  margin-bottom: 0.3em;
+  margin-top: 0.3em;
+  width: 1.2em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb {
+  /* vertically centering trick (margin: auto, top: 0, bottom: 0). On iOS and Safari, if you leave
+     * out these values, then it shows the thumb at the top of the spectrum. This is probably because it is
+     * absolutely positioned with only a left value, and not a top. Note, on Chrome it seems to be fine without
+     * this approach.
+    */
+  align-items: center;
+  background-clip: padding-box;
+  background-color: #455a64;
+  border: 0.5em solid rgba(136, 136, 136, 0);
+  border-radius: 3em;
+  bottom: 0;
+  color: #fff;
+  display: flex;
+  height: 0.5em;
+  justify-content: center;
+  left: -10px;
+  margin: auto;
+  position: absolute;
+  top: 0;
+  transition: border 120ms cubic-bezier(0.39, 0.58, 0.57, 1);
+  width: 0.5em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active {
+  border: 0.5em solid rgba(136, 136, 136, 0.39);
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group > div {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  flex: 1;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper {
+  flex-direction: column;
+  justify-content: center;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
+  align-items: center;
+  display: flex;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog) {
+  height: 100%;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container {
+  display: flex;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input {
+  background: #ffffff;
+  border: none;
+  border-radius: 0;
+  color: #455a64;
+  flex-grow: 1;
+  font-size: 0.85em;
+  padding-bottom: 0.1em;
+  padding-left: 5px;
+  padding-top: 0.1em;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder {
+  /* WebKit, Blink, Edge */
+  color: #888;
+}
+.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder {
+  /* WebKit, Blink, Edge */
+  color: #888;
+}
+/* dropup */
+.tinymce-mobile-dropup {
+  background: white;
+  display: flex;
+  overflow: hidden;
+  width: 100%;
+}
+.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking {
+  transition: height 0.3s ease-out;
+}
+.tinymce-mobile-dropup.tinymce-mobile-dropup-growing {
+  transition: height 0.3s ease-in;
+}
+.tinymce-mobile-dropup.tinymce-mobile-dropup-closed {
+  flex-grow: 0;
+}
+.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing) {
+  flex-grow: 1;
+}
+/* TODO min-height for device size and orientation */
+.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
+  min-height: 200px;
+}
+@media only screen and (orientation: landscape) {
+  .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
+    min-height: 200px;
+  }
+}
+@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
+  .tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
+    min-height: 150px;
+  }
+}
+/* styles menu */
+.tinymce-mobile-styles-menu {
+  font-family: sans-serif;
+  outline: 4px solid black;
+  overflow: hidden;
+  position: relative;
+  width: 100%;
+}
+.tinymce-mobile-styles-menu [role="menu"] {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  position: absolute;
+  width: 100%;
+}
+.tinymce-mobile-styles-menu [role="menu"].transitioning {
+  transition: transform 0.5s ease-in-out;
+}
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-item {
+  border-bottom: 1px solid #ddd;
+  color: #455a64;
+  cursor: pointer;
+  display: flex;
+  padding: 1em 1em;
+  position: relative;
+}
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before {
+  color: #455a64;
+  content: "\e314";
+  font-family: 'tinymce-mobile', sans-serif;
+}
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after {
+  color: #455a64;
+  content: "\e315";
+  font-family: 'tinymce-mobile', sans-serif;
+  padding-left: 1em;
+  padding-right: 1em;
+  position: absolute;
+  right: 0;
+}
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after {
+  font-family: 'tinymce-mobile', sans-serif;
+  padding-left: 1em;
+  padding-right: 1em;
+  position: absolute;
+  right: 0;
+}
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator,
+.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser {
+  align-items: center;
+  background: #fff;
+  border-top: #455a64;
+  color: #455a64;
+  display: flex;
+  min-height: 2.5em;
+  padding-left: 1em;
+  padding-right: 1em;
+}
+.tinymce-mobile-styles-menu [data-transitioning-destination="before"][data-transitioning-state],
+.tinymce-mobile-styles-menu [data-transitioning-state="before"] {
+  transform: translate(-100%);
+}
+.tinymce-mobile-styles-menu [data-transitioning-destination="current"][data-transitioning-state],
+.tinymce-mobile-styles-menu [data-transitioning-state="current"] {
+  transform: translate(0%);
+}
+.tinymce-mobile-styles-menu [data-transitioning-destination="after"][data-transitioning-state],
+.tinymce-mobile-styles-menu [data-transitioning-state="after"] {
+  transform: translate(100%);
+}
+@font-face {
+  font-family: 'tinymce-mobile';
+  font-style: normal;
+  font-weight: normal;
+  src: url('fonts/tinymce-mobile.woff?8x92w3') format('woff');
+}
+@media (min-device-width: 700px) {
+  .tinymce-mobile-outer-container,
+  .tinymce-mobile-outer-container input {
+    font-size: 25px;
+  }
+}
+@media (max-device-width: 700px) {
+  .tinymce-mobile-outer-container,
+  .tinymce-mobile-outer-container input {
+    font-size: 18px;
+  }
+}
+.tinymce-mobile-icon {
+  font-family: 'tinymce-mobile', sans-serif;
+}
+.mixin-flex-and-centre {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+.mixin-flex-bar {
+  align-items: center;
+  display: flex;
+  height: 100%;
+}
+.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe {
+  background-color: #fff;
+  width: 100%;
+}
+.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
+  /* Note, on the iPod touch in landscape, this isn't visible when the navbar appears */
+  background-color: #207ab7;
+  border-radius: 50%;
+  bottom: 1em;
+  color: white;
+  font-size: 1em;
+  height: 2.1em;
+  position: fixed;
+  right: 2em;
+  width: 2.1em;
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+@media only screen and (min-device-width:700px) {
+  .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
+    font-size: 1.2em;
+  }
+}
+.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket {
+  height: 300px;
+  overflow: hidden;
+}
+.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe {
+  height: 100%;
+}
+.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip {
+  display: none;
+}
+/*
+  Note, that if you don't include this (::-webkit-file-upload-button), the toolbar width gets
+  increased and the whole body becomes scrollable. It's important!
+ */
+input[type="file"]::-webkit-file-upload-button {
+  display: none;
+}
+@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
+  .tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
+    bottom: 50%;
+  }
+}
diff --git a/public/tinymce/skins/oxide/skin.mobile.min.css b/public/tinymce/skins/oxide/skin.mobile.min.css
new file mode 100644
index 0000000000..3a45cacf0f
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.mobile.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-outer-container{all:initial;display:block}.tinymce-mobile-outer-container *{border:0;box-sizing:initial;cursor:inherit;float:none;line-height:1;margin:0;outline:0;padding:0;-webkit-tap-highlight-color:transparent;text-shadow:none;white-space:nowrap}.tinymce-mobile-icon-arrow-back::before{content:"\e5cd"}.tinymce-mobile-icon-image::before{content:"\e412"}.tinymce-mobile-icon-cancel-circle::before{content:"\e5c9"}.tinymce-mobile-icon-full-dot::before{content:"\e061"}.tinymce-mobile-icon-align-center::before{content:"\e234"}.tinymce-mobile-icon-align-left::before{content:"\e236"}.tinymce-mobile-icon-align-right::before{content:"\e237"}.tinymce-mobile-icon-bold::before{content:"\e238"}.tinymce-mobile-icon-italic::before{content:"\e23f"}.tinymce-mobile-icon-unordered-list::before{content:"\e241"}.tinymce-mobile-icon-ordered-list::before{content:"\e242"}.tinymce-mobile-icon-font-size::before{content:"\e245"}.tinymce-mobile-icon-underline::before{content:"\e249"}.tinymce-mobile-icon-link::before{content:"\e157"}.tinymce-mobile-icon-unlink::before{content:"\eca2"}.tinymce-mobile-icon-color::before{content:"\e891"}.tinymce-mobile-icon-previous::before{content:"\e314"}.tinymce-mobile-icon-next::before{content:"\e315"}.tinymce-mobile-icon-large-font::before,.tinymce-mobile-icon-style-formats::before{content:"\e264"}.tinymce-mobile-icon-undo::before{content:"\e166"}.tinymce-mobile-icon-redo::before{content:"\e15a"}.tinymce-mobile-icon-removeformat::before{content:"\e239"}.tinymce-mobile-icon-small-font::before{content:"\e906"}.tinymce-mobile-format-matches::after,.tinymce-mobile-icon-readonly-back::before{content:"\e5ca"}.tinymce-mobile-icon-small-heading::before{content:"small"}.tinymce-mobile-icon-large-heading::before{content:"large"}.tinymce-mobile-icon-large-heading::before,.tinymce-mobile-icon-small-heading::before{font-family:sans-serif;font-size:80%}.tinymce-mobile-mask-edit-icon::before{content:"\e254"}.tinymce-mobile-icon-back::before{content:"\e5c4"}.tinymce-mobile-icon-heading::before{content:"Headings";font-family:sans-serif;font-size:80%;font-weight:700}.tinymce-mobile-icon-h1::before{content:"H1";font-weight:700}.tinymce-mobile-icon-h2::before{content:"H2";font-weight:700}.tinymce-mobile-icon-h3::before{content:"H3";font-weight:700}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask{align-items:center;display:flex;justify-content:center;background:rgba(51,51,51,.5);height:100%;position:absolute;top:0;width:100%}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container{align-items:center;border-radius:50%;display:flex;flex-direction:column;font-family:sans-serif;font-size:1em;justify-content:space-between}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{align-items:center;display:flex;justify-content:center;flex-direction:column;font-size:1em}@media only screen and (min-device-width:700px){.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{font-size:1.2em}}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em;background-color:#fff;color:#207ab7}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before{content:"\e900";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon{z-index:2}.tinymce-mobile-android-container.tinymce-mobile-android-maximized{background:#fff;border:none;bottom:0;display:flex;flex-direction:column;left:0;position:fixed;right:0;top:0}.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized){position:relative}.tinymce-mobile-android-container .tinymce-mobile-editor-socket{display:flex;flex-grow:1}.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe{display:flex!important;flex-grow:1;height:auto!important}.tinymce-mobile-android-scroll-reload{overflow:hidden}:not(.tinymce-mobile-readonly-mode)>.tinymce-mobile-android-selection-context-toolbar{margin-top:23px}.tinymce-mobile-toolstrip{background:#fff;display:flex;flex:0 0 auto;z-index:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar{align-items:center;background-color:#fff;border-bottom:1px solid #ccc;display:flex;flex:1;height:2.5em;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex-shrink:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container{background:#f44336}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group{flex-grow:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button{align-items:center;display:flex;height:80%;margin-left:2px;margin-right:2px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected{background:#c8cbcf;color:#ccc}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type{background:#207ab7;color:#eceff1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex:1;padding-bottom:.4em;padding-top:.4em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog{display:flex;min-height:1.5em;overflow:hidden;padding-left:0;padding-right:0;position:relative;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain{display:flex;height:100%;transition:left cubic-bezier(.4,0,1,1) .15s;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen{display:flex;flex:0 0 auto;justify-content:space-between;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input{font-family:Sans-serif}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container{display:flex;flex-grow:1;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x{-ms-grid-row-align:center;align-self:center;background:inherit;border:none;border-radius:50%;color:#888;font-size:.6em;font-weight:700;height:100%;padding-right:2px;position:absolute;right:0}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x{display:none}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before{align-items:center;display:flex;font-weight:700;height:100%;padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before{visibility:hidden}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item{color:#ccc;font-size:10px;line-height:10px;margin:0 2px;padding-top:3px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active{color:#c8cbcf}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before{margin-left:.5em;margin-right:.9em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before{margin-left:.9em;margin-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider{display:flex;flex:1;margin-left:0;margin-right:0;padding:.28em 0;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line{background:#ccc;display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container{padding-left:2em;padding-right:2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient{background:linear-gradient(to right,red 0,#feff00 17%,#0f0 33%,#00feff 50%,#00f 67%,#ff00fe 83%,red 100%);display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black{background:#000;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white{background:#fff;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb{align-items:center;background-clip:padding-box;background-color:#455a64;border:.5em solid rgba(136,136,136,0);border-radius:3em;bottom:0;color:#fff;display:flex;height:.5em;justify-content:center;left:-10px;margin:auto;position:absolute;top:0;transition:border 120ms cubic-bezier(.39,.58,.57,1);width:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active{border:.5em solid rgba(136,136,136,.39)}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper{flex-direction:column;justify-content:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog){height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container{display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input{background:#fff;border:none;border-radius:0;color:#455a64;flex-grow:1;font-size:.85em;padding-bottom:.1em;padding-left:5px;padding-top:.1em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder{color:#888}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder{color:#888}.tinymce-mobile-dropup{background:#fff;display:flex;overflow:hidden;width:100%}.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking{transition:height .3s ease-out}.tinymce-mobile-dropup.tinymce-mobile-dropup-growing{transition:height .3s ease-in}.tinymce-mobile-dropup.tinymce-mobile-dropup-closed{flex-grow:0}.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing){flex-grow:1}.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}@media only screen and (orientation:landscape){.tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:150px}}.tinymce-mobile-styles-menu{font-family:sans-serif;outline:4px solid #000;overflow:hidden;position:relative;width:100%}.tinymce-mobile-styles-menu [role=menu]{display:flex;flex-direction:column;height:100%;position:absolute;width:100%}.tinymce-mobile-styles-menu [role=menu].transitioning{transition:transform .5s ease-in-out}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item{border-bottom:1px solid #ddd;color:#455a64;cursor:pointer;display:flex;padding:1em 1em;position:relative}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before{color:#455a64;content:"\e314";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after{color:#455a64;content:"\e315";font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after{font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser,.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator{align-items:center;background:#fff;border-top:#455a64;color:#455a64;display:flex;min-height:2.5em;padding-left:1em;padding-right:1em}.tinymce-mobile-styles-menu [data-transitioning-destination=before][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=before]{transform:translate(-100%)}.tinymce-mobile-styles-menu [data-transitioning-destination=current][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=current]{transform:translate(0)}.tinymce-mobile-styles-menu [data-transitioning-destination=after][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=after]{transform:translate(100%)}@font-face{font-family:tinymce-mobile;font-style:normal;font-weight:400;src:url(fonts/tinymce-mobile.woff?8x92w3) format('woff')}@media (min-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:25px}}@media (max-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:18px}}.tinymce-mobile-icon{font-family:tinymce-mobile,sans-serif}.mixin-flex-and-centre{align-items:center;display:flex;justify-content:center}.mixin-flex-bar{align-items:center;display:flex;height:100%}.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe{background-color:#fff;width:100%}.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{background-color:#207ab7;border-radius:50%;bottom:1em;color:#fff;font-size:1em;height:2.1em;position:fixed;right:2em;width:2.1em;align-items:center;display:flex;justify-content:center}@media only screen and (min-device-width:700px){.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{font-size:1.2em}}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket{height:300px;overflow:hidden}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe{height:100%}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip{display:none}input[type=file]::-webkit-file-upload-button{display:none}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{bottom:50%}}
diff --git a/public/tinymce/skins/oxide/skin.shadowdom.css b/public/tinymce/skins/oxide/skin.shadowdom.css
new file mode 100644
index 0000000000..d2adc4db7f
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.shadowdom.css
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+body.tox-dialog__disable-scroll {
+  overflow: hidden;
+}
+.tox-fullscreen {
+  border: 0;
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+  -ms-scroll-chaining: none;
+      overscroll-behavior: none;
+  padding: 0;
+  touch-action: pinch-zoom;
+  width: 100%;
+}
+.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle {
+  display: none;
+}
+.tox.tox-tinymce.tox-fullscreen,
+.tox-shadowhost.tox-fullscreen {
+  left: 0;
+  position: fixed;
+  top: 0;
+  z-index: 1200;
+}
+.tox.tox-tinymce.tox-fullscreen {
+  background-color: transparent;
+}
+.tox-fullscreen .tox.tox-tinymce-aux,
+.tox-fullscreen ~ .tox.tox-tinymce-aux {
+  z-index: 1201;
+}
diff --git a/public/tinymce/skins/oxide/skin.shadowdom.min.css b/public/tinymce/skins/oxide/skin.shadowdom.min.css
new file mode 100644
index 0000000000..a0893b913e
--- /dev/null
+++ b/public/tinymce/skins/oxide/skin.shadowdom.min.css
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

From 47a89071e083b9478c7f3f5ab2daddd4b0c3163a Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 7 Jun 2022 14:09:01 +0200
Subject: [PATCH 18/95] Renamed default role method in contributor model as it
 triggered ActiveRecord::ConnectionNotEstablished exception

The full error was ActiveRecord::ConnectionNotEstablished - No connection pool for 'ActiveRecord::Base' found for the 'other' role.
---
 app/models/contributor.rb                            | 8 ++------
 app/services/api/v1/deserialization_service.rb       | 2 +-
 spec/services/api/v1/deserialization_service_spec.rb | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index 5cb2d9094d..d418d148f1 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -87,12 +87,8 @@ class Contributor < ApplicationRecord
   # ========================
   # = Static Class Methods =
   # ========================
-
-  class << self
-    # returns the default role
-    def default_role
-      'other'
-    end
+  def self.role_default
+    'other'
   end
 
   # Check for equality by matching on Plan, ORCID, email or name
diff --git a/app/services/api/v1/deserialization_service.rb b/app/services/api/v1/deserialization_service.rb
index 383cab77ad..1fe53510e0 100644
--- a/app/services/api/v1/deserialization_service.rb
+++ b/app/services/api/v1/deserialization_service.rb
@@ -41,7 +41,7 @@ def attach_identifier(object:, json:)
 
         # Translates the role in the json to a Contributor role
         def translate_role(role:)
-          default = ::Contributor.default_role
+          default = ::Contributor.role_default
           return default unless role.present?
 
           role = role.to_s unless role.is_a?(String)
diff --git a/spec/services/api/v1/deserialization_service_spec.rb b/spec/services/api/v1/deserialization_service_spec.rb
index c7e9cf41cf..209225c1f4 100644
--- a/spec/services/api/v1/deserialization_service_spec.rb
+++ b/spec/services/api/v1/deserialization_service_spec.rb
@@ -98,7 +98,7 @@
 
   describe ':translate_role(role:)' do
     before(:each) do
-      @default = Contributor.default_role
+      @default = Contributor.role_default
       @role = "#{Contributor::ONTOLOGY_BASE_URL}/#{Contributor.new.all_roles.sample}"
     end
 

From b5656fd0b3554cfd599454b19549ea9fbadb4ee3 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 7 Jun 2022 14:25:09 +0200
Subject: [PATCH 19/95] Fixed 'missing attribute: modifiable' when
 TemplatesController#show is called

---
 app/controllers/org_admin/templates_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 88f9ede0fe..d845729b51 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -108,8 +108,8 @@ def show
                        .includes(sections: { questions: :question_options })
                        .order('phases.number', 'sections.number', 'questions.number',
                               'question_options.number')
-                       .select('phases.title', 'phases.description', 'sections.title',
-                               'questions.text', 'question_options.text')
+                       .select('phases.title', 'phases.description', 'phases.modifiable',
+                               'sections.title', 'questions.text', 'question_options.text')
       unless template.latest?
         # rubocop:disable Layout/LineLength
         flash[:notice] = _('You are viewing a historical version of this template. You will not be able to make changes.')

From 1eec4f5468b42157cff50619c2ab2fc32c3dd139 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 7 Jun 2022 14:44:19 +0200
Subject: [PATCH 20/95] Fixed template visibility tests

---
 spec/models/template_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/template_spec.rb b/spec/models/template_spec.rb
index b4f983f90e..dd598b189a 100644
--- a/spec/models/template_spec.rb
+++ b/spec/models/template_spec.rb
@@ -1080,7 +1080,7 @@
     end
 
     it 'sets visibility to Organisationally visible' do
-      expect(subject.visibility).to eql('organisationally_visible')
+      expect(subject.visibility).to eql(Template.visibilities['organisationally_visible'])
     end
 
     it 'sets is_default to false' do
@@ -1149,7 +1149,7 @@
     end
 
     it 'sets the visibility to Organisationally visible' do
-      expect(subject.visibility).to eql('organisationally_visible')
+      expect(subject.visibility).to eql(Template.visibilities['organisationally_visible'])
     end
 
     it 'sets is_default to false' do

From ea947f305ae45cb134d8671f7f92b4c9ce9b3bae Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 7 Jun 2022 15:08:56 +0200
Subject: [PATCH 21/95] Fixed LocaleService#to_gettext test when locale is nil

---
 spec/services/locale_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/locale_service_spec.rb b/spec/services/locale_service_spec.rb
index d956c693d5..d58fc71440 100644
--- a/spec/services/locale_service_spec.rb
+++ b/spec/services/locale_service_spec.rb
@@ -48,7 +48,7 @@
 
   describe '#to_gettext(locale:)' do
     it 'uses the default_locale if no locale is specified' do
-      expect(described_class.to_gettext(locale: nil)).to eql(@default.abbreviation)
+      expect(described_class.to_gettext(locale: nil)).to eql(LocaleService.to_gettext(locale: @default.abbreviation))
     end
     it 'converts the locale to Gettext format' do
       expect(described_class.to_gettext(locale: 'en_GB')).to eql('en_GB')

From 465eb62fce786be5c36775950305ed0ca07dbd5f Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 10 Jun 2022 11:49:47 +0200
Subject: [PATCH 22/95] Fixed UnknownFormat Exceoption when using
 Repositories/MetadataStandards filters in Research Output form

---
 app/views/layouts/modal_search/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/modal_search/_form.html.erb b/app/views/layouts/modal_search/_form.html.erb
index a9b469c7bf..a6a15e59cd 100644
--- a/app/views/layouts/modal_search/_form.html.erb
+++ b/app/views/layouts/modal_search/_form.html.erb
@@ -47,7 +47,7 @@ no_results_msg = _("No results matched your filter criteria.")
 
       <div class="modal-body">
         <%# Search filters %>
-        <%= form_with model: model_instance, url: search_path, method: search_method,
+        <%= form_with model: model_instance, url: search_path, method: search_method, local: false,
                       id: "modal-search-#{namespace}-filters" do |f| %>
           <div class="form-group row">
             <div class="col-md-10">

From 2273b60458c320163265bae816c751bd0da5403e Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 10 Jun 2022 12:26:32 +0200
Subject: [PATCH 23/95] Solved issue with visibility attribution in Plan test
 factory

---
 spec/factories/plans.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/spec/factories/plans.rb b/spec/factories/plans.rb
index 6361c98bc1..f0a3f1b630 100644
--- a/spec/factories/plans.rb
+++ b/spec/factories/plans.rb
@@ -71,19 +71,27 @@
       end
     end
     trait :organisationally_visible do
-      visibility { 'organisationally_visible' }
+      after(:create) do |plan|
+        plan.update(visibility: Plan.visibilities[:organisationally_visible])
+      end
     end
 
     trait :publicly_visible do
-      visibility { 'publicly_visible' }
+      after(:create) do |plan|
+        plan.update(visibility: Plan.visibilities[:publicly_visible])
+      end
     end
 
     trait :is_test do
-      visibility { 'is_test' }
+      after(:create) do |plan|
+        plan.update(visibility: Plan.visibilities[:is_test])
+      end
     end
 
     trait :privately_visible do
-      visibility { 'privately_visible' }
+      after(:create) do |plan|
+        plan.update(visibility: Plan.visibilities[:privately_visible])
+      end
     end
 
     after(:create) do |plan, evaluator|

From d448bdbedf13278d6b1f9ee88afd1766eb336263 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 10 Jun 2022 14:46:53 +0200
Subject: [PATCH 24/95] Rubocoped config files

---
 app/controllers/orgs_controller.rb                | 5 -----
 config.ru                                         | 2 +-
 config/environments/development.rb                | 6 ++++--
 config/environments/production.rb                 | 5 +++--
 config/environments/test.rb                       | 1 +
 config/initializers/dragonfly.rb                  | 8 ++++----
 config/initializers/new_framework_defaults_6_1.rb | 1 +
 config/initializers/permissions_policy.rb         | 1 +
 config/initializers/rollbar.rb                    | 2 +-
 config/initializers/translation.rb                | 7 +++----
 spec/support/helpers/autocomplete_helper.rb       | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index f470d6d13e..e2d8129f8f 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -78,11 +78,6 @@ def admin_update
     # Remove the extraneous Org Selector hidden fields
     attrs = remove_org_selection_params(params_in: attrs)
 
-pp attrs
-junk_org = Org.new(attrs)
-p junk_org.valid?
-p junk_org.errors.full_messages
-
     if @org.update(attrs)
       # Save any identifiers that were found
       if current_user.can_super_admin? && lookup.present?
diff --git a/config.ru b/config.ru
index 4eb3d8a92b..4a5398ce61 100644
--- a/config.ru
+++ b/config.ru
@@ -3,6 +3,6 @@
 # This file is used by Rack-based servers to start the application.
 require File.expand_path("#{File.dirname(__FILE__)}/config/environment")
 
-map ENV['RAILS_RELATIVE_URL_ROOT'] || '/' do
+map ENV.fetch('RAILS_RELATIVE_URL_ROOT', '/') do
   run DMPRoadmap::Application
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1264845269..ade256c04b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
-require 'active_support/core_ext/integer/time'
 
+require 'active_support/core_ext/integer/time'
 
+# rubocop:disable Metrics/BlockLength
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -92,6 +93,7 @@
   # set this environment variable
   config.hosts << ENV['DMPROADMAP_HOST'] if ENV['DMPROADMAP_HOST'].present?
 end
+# rubocop:enable Metrics/BlockLength
 
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = ENV['DMPROADMAP_HOST'] || 'localhost:3000'
+Rails.application.routes.default_url_options[:host] = ENV.fetch('DMPROADMAP_HOST', 'localhost:3000')
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 89edc9b45f..9d17aeffdc 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
@@ -93,7 +94,7 @@
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end
@@ -131,4 +132,4 @@
   config.hosts << ENV['DMPROADMAP_HOST'] if ENV['DMPROADMAP_HOST'].present?
 end
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = ENV['DMPROADMAP_HOST'] || 'example.org'
+Rails.application.routes.default_url_options[:host] = ENV.fetch('DMPROADMAP_HOST', 'example.org')
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8b66766d88..7d008cd214 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
diff --git a/config/initializers/dragonfly.rb b/config/initializers/dragonfly.rb
index 9b6c1577c5..c1ea2d82ec 100644
--- a/config/initializers/dragonfly.rb
+++ b/config/initializers/dragonfly.rb
@@ -16,10 +16,10 @@
   if ENV['DRAGONFLY_AWS'] == 'true'
     require 'dragonfly/s3_data_store'
     datastore(:s3, {
-                bucket_name: ENV['AWS_BUCKET_NAME'],
-                access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-                region: ENV['AWS_REGION'],
+                bucket_name: ENV.fetch('AWS_BUCKET_NAME'),
+                access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+                secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+                region: ENV.fetch('AWS_REGION'),
                 root_path: Rails.env,
                 url_scheme: 'https'
               })
diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb
index 9526b835ab..0b4ce02317 100644
--- a/config/initializers/new_framework_defaults_6_1.rb
+++ b/config/initializers/new_framework_defaults_6_1.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.1 upgrade.
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
index 00f64d71b0..50bcf4eade 100644
--- a/config/initializers/permissions_policy.rb
+++ b/config/initializers/permissions_policy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Define an application-wide HTTP permissions policy. For further
 # information see https://developers.google.com/web/updates/2018/06/feature-policy
 #
diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
index 7c6adc2dba..877bd8b1dd 100644
--- a/config/initializers/rollbar.rb
+++ b/config/initializers/rollbar.rb
@@ -12,7 +12,7 @@
     # Without configuration, Rollbar is enabled in all environments.
     # To disable in specific environments, set config.enabled=false.
 
-    config.access_token = ENV['ROLLBAR_ACCESS_TOKEN']
+    config.access_token = ENV.fetch('ROLLBAR_ACCESS_TOKEN', nil)
 
     # Here we'll disable in 'test':
     config.enabled = false if Rails.env.test?
diff --git a/config/initializers/translation.rb b/config/initializers/translation.rb
index 79ec8e80f8..85e5e1c2eb 100644
--- a/config/initializers/translation.rb
+++ b/config/initializers/translation.rb
@@ -9,8 +9,7 @@
 SUPPORTED_LOCALES = %w[de en-CA en-GB en-US es fi fr-CA fr-FR pt-BR sv-FI tr-TR].freeze
 # You can define a subset of the locales for your instance's version of Translation.io if applicable
 CLIENT_LOCALES = %w[de en-CA en-GB en-US es fi fr-CA fr-FR pt-BR sv-FI tr-TR].freeze
-DEFAULT_LOCALE = 'en-GB'.freeze
-
+DEFAULT_LOCALE = 'en-GB'
 # Here we define the translation domains for the Roadmap application, `app` will
 # contain translations from the open-source repository and ignore the contents
 # of the `app/views/branded` directory.  The `client` domain will
@@ -22,7 +21,7 @@
 # domain specified in order to generate both sets of translation keys.
 if !ENV['DOMAIN'] || ENV['DOMAIN'] == 'app'
   TranslationIO.configure do |config|
-    config.api_key              = ENV['TRANSLATION_API_ROADMAP']
+    config.api_key              = ENV.fetch('TRANSLATION_API_ROADMAP', nil)
     config.source_locale        = 'en'
     config.target_locales       = SUPPORTED_LOCALES
     config.text_domain          = 'app'
@@ -32,7 +31,7 @@
   end
 elsif ENV['DOMAIN'] == 'client'
   TranslationIO.configure do |config|
-    config.api_key              = ENV['TRANSLATION_API_CLIENT']
+    config.api_key              = ENV.fetch('TRANSLATION_API_CLIENT', nil)
     config.source_locale        = 'en'
     config.target_locales       = CLIENT_LOCALES
     config.text_domain          = 'client'
diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index 8f8818a0d2..d9a9e64886 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -17,7 +17,7 @@ def select_an_org(autocomplete_id, org)
 
   def choose_suggestion(suggestion_text)
     matcher = '.ui-autocomplete .ui-menu-item'
-    matching_element = all(:css, matcher).detect do |element|
+    matching_element = find(:css, matcher).detect do |element|
       element.text.strip == suggestion_text.strip
     end
     raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?

From b98d081440de9f43999faf46f6a853bc4f1f3f53 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Mon, 13 Jun 2022 14:51:37 +0000
Subject: [PATCH 25/95] fixes for rails upgrade

---
 app/controllers/orgs_controller.rb               | 5 -----
 app/models/application_record.rb                 | 4 ++--
 app/models/org.rb                                | 7 +++----
 spec/controllers/contributors_controller_spec.rb | 2 +-
 spec/factories/templates.rb                      | 1 -
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index f470d6d13e..e2d8129f8f 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -78,11 +78,6 @@ def admin_update
     # Remove the extraneous Org Selector hidden fields
     attrs = remove_org_selection_params(params_in: attrs)
 
-pp attrs
-junk_org = Org.new(attrs)
-p junk_org.valid?
-p junk_org.errors.full_messages
-
     if @org.update(attrs)
       # Save any identifiers that were found
       if current_user.can_super_admin? && lookup.present?
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index fc9717e959..ecde6e7ebf 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -11,11 +11,11 @@ class ApplicationRecord < ActiveRecord::Base
   class << self
     # Indicates whether the underlying DB is MySQL
     def mysql_db?
-      ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      connection.adapter_name == 'Mysql2'
     end
 
     def postgres_db?
-      ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      connection.adapter_name == 'PostgreSQL'
     end
 
     # Generates the appropriate where clause for a JSON field based on the DB type
diff --git a/app/models/org.rb b/app/models/org.rb
index e89af44ff7..2efa740c33 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -127,10 +127,9 @@ class Org < ApplicationRecord
                     message: _("can't be larger than 500KB")
 
   # allow validations for logo upload
-  dragonfly_accessor :logo
-  # dragonfly_accessor :logo do
-  #   after_assign :resize_image
-  # end
+  dragonfly_accessor :logo do
+    after_assign :resize_image
+  end
 
   # =============
   # = Callbacks =
diff --git a/spec/controllers/contributors_controller_spec.rb b/spec/controllers/contributors_controller_spec.rb
index 5e94b66f95..1545c6a901 100644
--- a/spec/controllers/contributors_controller_spec.rb
+++ b/spec/controllers/contributors_controller_spec.rb
@@ -8,7 +8,7 @@
     @org = create(:org, managed: true)
     @plan = create(:plan, :creator, org: @org)
     @user = @plan.owner
-    @contributor = create(:contributor, plan: @plan)
+    @contributor = create(:contributor, plan: @plan, org: @org)
 
     @params_hash = {
       contributor: {
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index 918b1b999b..3b38a95f93 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -42,7 +42,6 @@
     published { false }
     archived { false }
     sequence(:version)
-    # links { { funder: [], sample_plan: [] } }
 
     trait :publicly_visible do
       after(:create) do |template|

From 89d2ff1d3a77d745fe9027b55b55bd26b3c3b083 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Mon, 13 Jun 2022 17:10:35 +0000
Subject: [PATCH 26/95] fixed some issues with tests

---
 Gemfile                                    | 2 +-
 Gemfile.lock                               | 1 -
 app/services/api/v1/persistence_service.rb | 9 +++------
 spec/models/department_spec.rb             | 1 +
 spec/models/org_spec.rb                    | 4 ++--
 spec/models/perm_spec.rb                   | 4 ++--
 spec/models/question_format_spec.rb        | 4 ++--
 spec/models/region_spec.rb                 | 4 ++--
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 047b4682df..7fe1d89daf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -267,7 +267,7 @@ group :test do
 
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara'
-  gem 'selenium-webdriver'
+  # gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 26755dc63d..b238120b4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -587,7 +587,6 @@ DEPENDENCIES
   rubocop-thread_safety
   sass-rails
   sassc-rails
-  selenium-webdriver
   shoulda
   spring
   spring-commands-rspec
diff --git a/app/services/api/v1/persistence_service.rb b/app/services/api/v1/persistence_service.rb
index 3a92230256..b35df07260 100644
--- a/app/services/api/v1/persistence_service.rb
+++ b/app/services/api/v1/persistence_service.rb
@@ -38,8 +38,8 @@ def safe_save_identifier(identifier:)
 
           Identifier.transaction do
             identifier.save if identifier.valid?
-            return identifier unless identifier.new_record?
           end
+          return identifier if identifier.valid? && !identifier.new_record?
 
           Identifier.where(identifier_scheme: identifier.identifier_scheme,
                            value: identifier.value,
@@ -51,17 +51,14 @@ def safe_save_org(org:)
 
           Org.transaction do
             organization = Org.find_or_initialize_by(name: org.name)
-            if organization.new_record?
-              # Now that we know its a new record make sure its valid first
-              return nil unless org.valid?
-
+            if organization.new_record? && org.valid?
               organization.update(saveable_attributes(attrs: org.attributes))
               org.identifiers.each do |id|
                 id.identifiable = organization.reload
                 safe_save_identifier(identifier: id)
               end
             end
-            organization.reload
+            organization.reload if organization.valid?
           end
         end
 
diff --git a/spec/models/department_spec.rb b/spec/models/department_spec.rb
index 9d79776f5a..8973ca5e48 100644
--- a/spec/models/department_spec.rb
+++ b/spec/models/department_spec.rb
@@ -14,6 +14,7 @@
       org = create(:org)
       subject = create(:department, org_id: org.id)
       expect(subject).to validate_uniqueness_of(:name)
+        .case_insensitive
         .scoped_to(:org_id)
         .with_message('must be unique')
     end
diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 187bfbeca6..00c090c4d6 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -8,8 +8,8 @@
 
     it {
       subject.name = 'DMP Company'
-      is_expected.to validate_uniqueness_of(:name)
-        .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).case_insensitive
+                                                  .with_message('must be unique')
     }
 
     it { is_expected.to allow_values(true, false).for(:is_other) }
diff --git a/spec/models/perm_spec.rb b/spec/models/perm_spec.rb
index c590af447b..39cb3c8a4e 100644
--- a/spec/models/perm_spec.rb
+++ b/spec/models/perm_spec.rb
@@ -24,8 +24,8 @@ def recreate_all
     it { is_expected.to validate_presence_of(:name) }
 
     it {
-      is_expected.to validate_uniqueness_of(:name)
-        .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).case_insensitive
+                                                  .with_message('must be unique')
     }
   end
 
diff --git a/spec/models/question_format_spec.rb b/spec/models/question_format_spec.rb
index 89a6676666..59f375263d 100644
--- a/spec/models/question_format_spec.rb
+++ b/spec/models/question_format_spec.rb
@@ -7,8 +7,8 @@
     it { is_expected.to validate_presence_of(:title) }
 
     it {
-      is_expected.to validate_uniqueness_of(:title)
-        .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:title).case_insensitive
+                                                   .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }
diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 90fbef90fa..3645ebdd65 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -7,8 +7,8 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
-      is_expected.to validate_uniqueness_of(:abbreviation)
-        .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:abbreviation).case_insensitive
+                                                          .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }

From 29b93e21e3f8ce4d5034d1aafad4ae34053992e9 Mon Sep 17 00:00:00 2001
From: briri <briley@ucop.edu>
Date: Mon, 13 Jun 2022 17:30:09 +0000
Subject: [PATCH 27/95] reverted change to Gemfile

---
 Gemfile      | 2 +-
 Gemfile.lock | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7fe1d89daf..047b4682df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -267,7 +267,7 @@ group :test do
 
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara'
-  # gem 'selenium-webdriver'
+  gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b238120b4a..26755dc63d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -587,6 +587,7 @@ DEPENDENCIES
   rubocop-thread_safety
   sass-rails
   sassc-rails
+  selenium-webdriver
   shoulda
   spring
   spring-commands-rspec

From 9d65c7e81fb9602cacc07df8d5ed23e8a9f4d985 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 18:23:50 +0000
Subject: [PATCH 28/95] breaking apart github workflow for mysql to try and
 determine issue with building the test db'

---
 .github/workflows/mysql.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index b8db0ec031..1b6950bd6c 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -48,10 +48,13 @@ jobs:
 
     # Start the DB server and initialize the DB
     - name: 'Start MySQL'
-      run: |
-        sudo systemctl start mysql
-        bin/rails db:setup RAILS_ENV=test
-        bin/rails db:migrate RAILS_ENV=test
+      run: sudo systemctl start mysql
+
+    - name: 'Build out the test database'
+      run: bin/rails db:setup RAILS_ENV=test
+
+    - name: 'Run any pending database migrations'
+      run: bin/rails db:migrate RAILS_ENV=test
 
     # Prebuild the CSS, JS and image assets
     - name: 'Precompile all of the Assets'

From 4ca24505f6636f2fb2f0582f3c20d3efc83f315a Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 18:32:56 +0000
Subject: [PATCH 29/95] tweak to mysql github file

---
 .github/workflows/mysql.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 1b6950bd6c..9dba312f7e 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -51,7 +51,9 @@ jobs:
       run: sudo systemctl start mysql
 
     - name: 'Build out the test database'
-      run: bin/rails db:setup RAILS_ENV=test
+      run: |
+        bin/rails db:create RAILS_ENV=test
+        bin/rails db:schema:load RAILS_ENV=test
 
     - name: 'Run any pending database migrations'
       run: bin/rails db:migrate RAILS_ENV=test

From 193c89113435cd2eae33a819d0a5f6d1dbcf9371 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 18:41:24 +0000
Subject: [PATCH 30/95] fix for rubocop

---
 app/services/api/v1/persistence_service.rb | 2 ++
 config/initializers/wicked_pdf.rb.example  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/api/v1/persistence_service.rb b/app/services/api/v1/persistence_service.rb
index b35df07260..68c83f79da 100644
--- a/app/services/api/v1/persistence_service.rb
+++ b/app/services/api/v1/persistence_service.rb
@@ -46,6 +46,7 @@ def safe_save_identifier(identifier:)
                            identifiable: identifier.identifiable).first
         end
 
+        # rubocop:disable Metrics/AbcSize
         def safe_save_org(org:)
           return nil unless org.is_a?(Org)
 
@@ -61,6 +62,7 @@ def safe_save_org(org:)
             organization.reload if organization.valid?
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         # rubocop:disable Metrics/AbcSize
         def safe_save_contributor(contributor:)
diff --git a/config/initializers/wicked_pdf.rb.example b/config/initializers/wicked_pdf.rb.example
index a38c6e23cd..358af1777e 100644
--- a/config/initializers/wicked_pdf.rb.example
+++ b/config/initializers/wicked_pdf.rb.example
@@ -3,7 +3,7 @@
 module DMPRoadmap
   class Application < Rails::Application
     WickedPdf.config = {
-      exe_path: ENV['WICKED_PDF_PATH'] || '/usr/local/bin/wkhtmltopdf'
+      exe_path: ENV.fetch('WICKED_PDF_PATH', '/usr/local/bin/wkhtmltopdf')
     }
   end
 end

From 240410fc8fe6ece068dd0720a690cf39c64785c4 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 18:51:49 +0000
Subject: [PATCH 31/95] revert change to model specs for case sensitivity'

---
 spec/models/department_spec.rb      | 1 -
 spec/models/org_spec.rb             | 3 +--
 spec/models/perm_spec.rb            | 3 +--
 spec/models/question_format_spec.rb | 3 +--
 spec/models/region_spec.rb          | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/spec/models/department_spec.rb b/spec/models/department_spec.rb
index 8973ca5e48..9d79776f5a 100644
--- a/spec/models/department_spec.rb
+++ b/spec/models/department_spec.rb
@@ -14,7 +14,6 @@
       org = create(:org)
       subject = create(:department, org_id: org.id)
       expect(subject).to validate_uniqueness_of(:name)
-        .case_insensitive
         .scoped_to(:org_id)
         .with_message('must be unique')
     end
diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 00c090c4d6..43a264f7db 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -8,8 +8,7 @@
 
     it {
       subject.name = 'DMP Company'
-      is_expected.to validate_uniqueness_of(:name).case_insensitive
-                                                  .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).with_message('must be unique')
     }
 
     it { is_expected.to allow_values(true, false).for(:is_other) }
diff --git a/spec/models/perm_spec.rb b/spec/models/perm_spec.rb
index 39cb3c8a4e..cb480b6ebf 100644
--- a/spec/models/perm_spec.rb
+++ b/spec/models/perm_spec.rb
@@ -24,8 +24,7 @@ def recreate_all
     it { is_expected.to validate_presence_of(:name) }
 
     it {
-      is_expected.to validate_uniqueness_of(:name).case_insensitive
-                                                  .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).with_message('must be unique')
     }
   end
 
diff --git a/spec/models/question_format_spec.rb b/spec/models/question_format_spec.rb
index 59f375263d..dc4068421e 100644
--- a/spec/models/question_format_spec.rb
+++ b/spec/models/question_format_spec.rb
@@ -7,8 +7,7 @@
     it { is_expected.to validate_presence_of(:title) }
 
     it {
-      is_expected.to validate_uniqueness_of(:title).case_insensitive
-                                                   .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:title).with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }
diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 3645ebdd65..9a5543eaef 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -7,8 +7,7 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
-      is_expected.to validate_uniqueness_of(:abbreviation).case_insensitive
-                                                          .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:abbreviation).with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }

From 1c5a2d1c3d89d5c53440f75ccb32d22d8e7b60f2 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 19:04:57 +0000
Subject: [PATCH 32/95] update to flagshihtzu definitions to handle calls to
 check_for_column when the Rails context is not available

---
 app/models/contributor.rb       | 3 ++-
 app/models/identifier_scheme.rb | 3 ++-
 app/models/org.rb               | 3 ++-
 app/models/role.rb              | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index d418d148f1..b462efc610 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -68,7 +68,8 @@ class Contributor < ApplicationRecord
             2 => :investigation,
             3 => :project_administration,
             4 => :other,
-            column: 'roles'
+            column: 'roles',
+            check_for_column: !Rails.env.test?
 
   # ==========
   # = Scopes =
diff --git a/app/models/identifier_scheme.rb b/app/models/identifier_scheme.rb
index ea712e3901..da664144eb 100644
--- a/app/models/identifier_scheme.rb
+++ b/app/models/identifier_scheme.rb
@@ -51,7 +51,8 @@ class IdentifierScheme < ApplicationRecord
             3 => :for_plans,
             4 => :for_users,
             5 => :for_contributors,
-            column: 'context'
+            column: 'context',
+            check_for_column: !Rails.env.test?
 
   # =========================
   # = Custom Accessor Logic =
diff --git a/app/models/org.rb b/app/models/org.rb
index 2efa740c33..756bb89fe5 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -172,7 +172,8 @@ def check_for_missing_logo_file
             4 => :research_institute,
             5 => :project,
             6 => :school,
-            column: 'org_type'
+            column: 'org_type',
+            check_for_column: !Rails.env.test?
 
   # The default Org is the one whose guidance is auto-attached to
   # plans when a plan is created
diff --git a/app/models/role.rb b/app/models/role.rb
index d6df1e10e0..d062c15f3a 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -45,7 +45,8 @@ class Role < ApplicationRecord
             3 => :editor,             # 4
             4 => :commenter,          # 8
             5 => :reviewer,           # 16
-            column: 'access'
+            column: 'access',
+            check_for_column: !Rails.env.test?
 
   # ===============
   # = Validations =

From 0f27d3bb19e042e2c8b057b1a280f55914e50505 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 19:43:00 +0000
Subject: [PATCH 33/95] added some sleep statements to rspec that try to access
 suggestions

---
 spec/features/super_admins/merge_org_spec.rb                    | 2 +-
 spec/features/super_admins/org_swaps_spec.rb                    | 1 +
 .../features/templates/templates_upgrade_customisations_spec.rb | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/features/super_admins/merge_org_spec.rb b/spec/features/super_admins/merge_org_spec.rb
index f4c3fbad27..10d95b9438 100644
--- a/spec/features/super_admins/merge_org_spec.rb
+++ b/spec/features/super_admins/merge_org_spec.rb
@@ -45,7 +45,7 @@
     expect(page).to have_text('Merge Organisations')
     find('#org_org_name').click
     fill_in(:org_org_name, with: @to_org.name[0..6])
-    sleep(0.5)
+    sleep(0.8)
     choose_suggestion(@to_org.name)
 
     click_button 'Analyze'
diff --git a/spec/features/super_admins/org_swaps_spec.rb b/spec/features/super_admins/org_swaps_spec.rb
index edf90939c6..1695d7a971 100644
--- a/spec/features/super_admins/org_swaps_spec.rb
+++ b/spec/features/super_admins/org_swaps_spec.rb
@@ -22,6 +22,7 @@
     click_link 'Templates'
     find('#superadmin_user_org_name').click
     fill_in(:superadmin_user_org_name, with: @org2.name[0..4])
+    sleep(0.8)
     choose_suggestion(@org2.name)
     click_button 'Change affiliation'
     expect(current_path).to eql(org_admin_templates_path)
diff --git a/spec/features/templates/templates_upgrade_customisations_spec.rb b/spec/features/templates/templates_upgrade_customisations_spec.rb
index 0ab34a6f99..3456e00147 100644
--- a/spec/features/templates/templates_upgrade_customisations_spec.rb
+++ b/spec/features/templates/templates_upgrade_customisations_spec.rb
@@ -52,6 +52,7 @@
 
     # Move to the other funder Org's Templates
     fill_in(:superadmin_user_org_name, with: funder.name)
+    sleep(0.8)
     choose_suggestion(funder.name)
     click_button('Change affiliation')
 

From 9a1c42ba504e048c0edd48cd0a213960e0a0d629 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 19:58:07 +0000
Subject: [PATCH 34/95] added logic to retry suggestion updates for rspec tests
 of org autocompletes

---
 spec/features/super_admins/org_swaps_spec.rb      |  1 -
 .../templates_upgrade_customisations_spec.rb      |  1 -
 spec/support/helpers/autocomplete_helper.rb       | 15 ++++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/spec/features/super_admins/org_swaps_spec.rb b/spec/features/super_admins/org_swaps_spec.rb
index 1695d7a971..edf90939c6 100644
--- a/spec/features/super_admins/org_swaps_spec.rb
+++ b/spec/features/super_admins/org_swaps_spec.rb
@@ -22,7 +22,6 @@
     click_link 'Templates'
     find('#superadmin_user_org_name').click
     fill_in(:superadmin_user_org_name, with: @org2.name[0..4])
-    sleep(0.8)
     choose_suggestion(@org2.name)
     click_button 'Change affiliation'
     expect(current_path).to eql(org_admin_templates_path)
diff --git a/spec/features/templates/templates_upgrade_customisations_spec.rb b/spec/features/templates/templates_upgrade_customisations_spec.rb
index 3456e00147..0ab34a6f99 100644
--- a/spec/features/templates/templates_upgrade_customisations_spec.rb
+++ b/spec/features/templates/templates_upgrade_customisations_spec.rb
@@ -52,7 +52,6 @@
 
     # Move to the other funder Org's Templates
     fill_in(:superadmin_user_org_name, with: funder.name)
-    sleep(0.8)
     choose_suggestion(funder.name)
     click_button('Change affiliation')
 
diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index d9a9e64886..d0da3d6b45 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -17,7 +17,20 @@ def select_an_org(autocomplete_id, org)
 
   def choose_suggestion(suggestion_text)
     matcher = '.ui-autocomplete .ui-menu-item'
-    matching_element = find(:css, matcher).detect do |element|
+
+    # Wait until the suggestions JS has finished
+    counter = 0
+    suggestions = nil
+    until counter >= 5 do
+      suggestions = matching_element = find(:css, matcher)
+      counter = 5 if suggestions.present?
+      sleep(0.3) unless suggestions.preesent?
+
+      counter += 1
+    end
+    raise ArgumentError, "No such suggestions available" unless suggestions.present?
+
+    matching_element = suggestions.detect do |element|
       element.text.strip == suggestion_text.strip
     end
     raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?

From ae8de5dc5e706891dbff8ecd372f0588eeb90195 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 20:22:19 +0000
Subject: [PATCH 35/95] fixed typos

---
 spec/support/helpers/autocomplete_helper.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index d0da3d6b45..f685661fc7 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -22,11 +22,9 @@ def choose_suggestion(suggestion_text)
     counter = 0
     suggestions = nil
     until counter >= 5 do
-      suggestions = matching_element = find(:css, matcher)
-      counter = 5 if suggestions.present?
-      sleep(0.3) unless suggestions.preesent?
-
-      counter += 1
+      suggestions = find(:css, matcher)
+      counter = suggestions.present? ? 5 : counter + 1
+      sleep(0.3) unless suggestions.present?
     end
     raise ArgumentError, "No such suggestions available" unless suggestions.present?
 

From ff5fef4bd9df7de68588891a0eb6faacf24d2c93 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 20:46:03 +0000
Subject: [PATCH 36/95] another attempt to fix rspec tests with org
 autocompletes

---
 spec/support/helpers/autocomplete_helper.rb | 22 ++++++---------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index f685661fc7..88782da599 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -16,22 +16,12 @@ def select_an_org(autocomplete_id, org)
   end
 
   def choose_suggestion(suggestion_text)
-    matcher = '.ui-autocomplete .ui-menu-item'
-
-    # Wait until the suggestions JS has finished
-    counter = 0
-    suggestions = nil
-    until counter >= 5 do
-      suggestions = find(:css, matcher)
-      counter = suggestions.present? ? 5 : counter + 1
-      sleep(0.3) unless suggestions.present?
-    end
-    raise ArgumentError, "No such suggestions available" unless suggestions.present?
-
-    matching_element = suggestions.detect do |element|
-      element.text.strip == suggestion_text.strip
-    end
-    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
+    # matcher = '.ui-autocomplete .ui-menu-item'
+    # matching_element = find(:css, matcher) do |element|
+    #   element.text.strip == suggestion_text.strip
+    # end
+    matching_element = find(:css, ".ui-autocomplete .ui-menu-item:contains(\"#{suggestion_text.strip}\")")
+    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'"
 
     matching_element.click
     # Wait for the JS to run

From 6c72eafca3413c0577975e967de55c3d472ee1bf Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 20:48:42 +0000
Subject: [PATCH 37/95] another attempt to fix rspec tests with org
 autocompletes

---
 spec/support/helpers/autocomplete_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index 88782da599..915560ec97 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -21,7 +21,7 @@ def choose_suggestion(suggestion_text)
     #   element.text.strip == suggestion_text.strip
     # end
     matching_element = find(:css, ".ui-autocomplete .ui-menu-item:contains(\"#{suggestion_text.strip}\")")
-    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'"
+    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
 
     matching_element.click
     # Wait for the JS to run

From 9da63a59a3ef96fd733a306a4f0e44980f7c3691 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 22:08:47 +0000
Subject: [PATCH 38/95] another attempt to fix rspec tests with org
 autocompletes

---
 spec/support/helpers/autocomplete_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index 915560ec97..370e25ce46 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -20,7 +20,7 @@ def choose_suggestion(suggestion_text)
     # matching_element = find(:css, matcher) do |element|
     #   element.text.strip == suggestion_text.strip
     # end
-    matching_element = find(:css, ".ui-autocomplete .ui-menu-item:contains(\"#{suggestion_text.strip}\")")
+    matching_element = find(:xpath, "//div[@class='ui-menu-item-wrapper' and normalize-space()='#{suggestion_text}']")
     raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
 
     matching_element.click

From 48f392002bf139cbb1a84be6d53a9abbd4e2d8e5 Mon Sep 17 00:00:00 2001
From: briri <riley.bri@gmail.com>
Date: Mon, 13 Jun 2022 22:39:10 +0000
Subject: [PATCH 39/95] another attempt to fix rspec tests with org
 autocompletes

---
 spec/support/helpers/autocomplete_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index 370e25ce46..a6582c6aa5 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -20,7 +20,7 @@ def choose_suggestion(suggestion_text)
     # matching_element = find(:css, matcher) do |element|
     #   element.text.strip == suggestion_text.strip
     # end
-    matching_element = find(:xpath, "//div[@class='ui-menu-item-wrapper' and normalize-space()='#{suggestion_text}']")
+    matching_element = find('.ui-item-wrapper', text: suggestion_text.strip)
     raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
 
     matching_element.click

From efa9fc64c2cfc88688f61030b1e79d8c4ce6ee08 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 14 Jun 2022 15:53:48 +0200
Subject: [PATCH 40/95] Updated Ruby version to 2.7.6

---
 Gemfile      |  2 +-
 Gemfile.lock | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 047b4682df..d8f6a92d67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '>= 2.6.3'
+ruby '>= 2.7.6'
 
 # ===========#
 # CORE RAILS #
diff --git a/Gemfile.lock b/Gemfile.lock
index 26755dc63d..c5b8ef131e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,7 +47,7 @@ GEM
     activerecord (6.1.6)
       activemodel (= 6.1.6)
       activesupport (= 6.1.6)
-    activerecord_json_validator (2.1.0)
+    activerecord_json_validator (2.1.1)
       activerecord (>= 4.2.0, < 8)
       json_schemer (~> 0.2.18)
     activestorage (6.1.6)
@@ -70,7 +70,7 @@ GEM
       rake (>= 10.4, < 14.0)
     annotate_gem (0.0.14)
       bundler (>= 1.1)
-    api-pagination (4.8.2)
+    api-pagination (5.0.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
@@ -95,7 +95,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capybara (3.36.0)
+    capybara (3.37.1)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -233,7 +233,7 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    jwt (2.3.0)
+    jwt (2.4.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -358,7 +358,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.6)
       actionpack (= 6.1.6)
@@ -371,7 +371,7 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    recaptcha (5.9.0)
+    recaptcha (5.10.0)
       json
     regexp_parser (2.5.0)
     responders (3.0.1)
@@ -402,7 +402,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.30.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -415,10 +415,10 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    rubocop-performance (1.14.0)
+    rubocop-performance (1.14.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-rails (2.15.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -510,13 +510,13 @@ GEM
     wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
     zaru (0.3.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   x86_64-linux
@@ -606,7 +606,7 @@ DEPENDENCIES
   zaru
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 2.7.6p219
 
 BUNDLED WITH
    2.3.15

From 46b4fc733cc8e16e4dace59c9640a53214d56df6 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 14 Jun 2022 15:56:12 +0200
Subject: [PATCH 41/95] Updated Ruby version in github workflow files

---
 .github/workflows/mysql.yml    | 2 +-
 .github/workflows/postgres.yml | 2 +-
 .github/workflows/rubocop.yml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 9dba312f7e..189a16ef12 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -19,7 +19,7 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.3
+        ruby-version: 2.7.6
         bundler-cache: true
 
     # Install Node
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 2159c8d10e..cdeebd324a 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -35,7 +35,7 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.3
+        ruby-version: 2.7.6
         bundler-cache: true
 
     # Install Node
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 0fd54b1cc4..57e84481cc 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -13,7 +13,7 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.3
+        ruby-version: 2.7.6
         bundler-cache: true
 
     # Run the Rubocop linter checks

From 66a5d660ec1227db12602da19cd8ce30864ada68 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 14 Jun 2022 15:56:43 +0200
Subject: [PATCH 42/95] Rubocoped some files

---
 app/controllers/concerns/paginable.rb           | 2 +-
 app/models/language.rb                          | 2 +-
 app/models/settings/template.rb                 | 4 ++--
 lib/cleanup/deprecators/get_deprecator.rb       | 2 +-
 lib/cleanup/deprecators/predicate_deprecator.rb | 2 +-
 lib/cleanup/deprecators/set_deprecator.rb       | 2 +-
 spec/mixins/versionable_model.rb                | 2 +-
 spec/rails_helper.rb                            | 4 ++--
 spec/support/helpers/autocomplete_helper.rb     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
index 71d3eacb01..3c89151fe2 100644
--- a/app/controllers/concerns/paginable.rb
+++ b/app/controllers/concerns/paginable.rb
@@ -8,7 +8,7 @@ module Paginable
 
   ##
   # Regex to validate sort_field param is safe
-  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]+$/.freeze
+  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]+$/
 
   PAGINATION_QUERY_PARAMS = %i[page sort_field sort_direction
                                search controller action].freeze
diff --git a/app/models/language.rb b/app/models/language.rb
index d08a701911..3755e29bac 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -19,7 +19,7 @@ class Language < ApplicationRecord
 
   ABBREVIATION_MAXIMUM_LENGTH = 5
 
-  ABBREVIATION_FORMAT = /\A[a-z]{2}(-[A-Z]{2})?\Z/.freeze
+  ABBREVIATION_FORMAT = /\A[a-z]{2}(-[A-Z]{2})?\Z/
 
   NAME_MAXIMUM_LENGTH = 20
 
diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
index a0ee4c6377..21ef58b928 100644
--- a/app/models/settings/template.rb
+++ b/app/models/settings/template.rb
@@ -21,8 +21,8 @@ class Template < RailsSettings::SettingObject
       'Arial, Helvetica, Sans-Serif'
     ].freeze
 
-    VALID_FONT_SIZE_RANGE = (8..14).freeze
-    VALID_MARGIN_RANGE = (5..25).freeze
+    VALID_FONT_SIZE_RANGE = (8..14)
+    VALID_MARGIN_RANGE = (5..25)
 
     VALID_ADMIN_FIELDS = %w[project_name project_identifier grant_title
                             principal_investigator project_data_contact
diff --git a/lib/cleanup/deprecators/get_deprecator.rb b/lib/cleanup/deprecators/get_deprecator.rb
index f8e45aaa7e..45c2fcd447 100644
--- a/lib/cleanup/deprecators/get_deprecator.rb
+++ b/lib/cleanup/deprecators/get_deprecator.rb
@@ -13,7 +13,7 @@ class GetDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information."
+                "Read #{__FILE__} for more information.".freeze
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/lib/cleanup/deprecators/predicate_deprecator.rb b/lib/cleanup/deprecators/predicate_deprecator.rb
index a9d282a362..8fd8774c90 100644
--- a/lib/cleanup/deprecators/predicate_deprecator.rb
+++ b/lib/cleanup/deprecators/predicate_deprecator.rb
@@ -12,7 +12,7 @@ class PredicateDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information."
+                "Read #{__FILE__} for more information.".freeze
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/lib/cleanup/deprecators/set_deprecator.rb b/lib/cleanup/deprecators/set_deprecator.rb
index 91a29d12e7..294878fcb4 100644
--- a/lib/cleanup/deprecators/set_deprecator.rb
+++ b/lib/cleanup/deprecators/set_deprecator.rb
@@ -13,7 +13,7 @@ class SetDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information."
+                "Read #{__FILE__} for more information.".freeze
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/spec/mixins/versionable_model.rb b/spec/mixins/versionable_model.rb
index 66c6ce883f..aa6ed1c9c1 100644
--- a/spec/mixins/versionable_model.rb
+++ b/spec/mixins/versionable_model.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-UUID_REGEX = /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i.freeze
+UUID_REGEX = /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i
 
 shared_examples_for 'VersionableModel' do
   context 'attributes' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 9f8c32b0ed..2aebe25948 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -24,9 +24,9 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
-Dir[Rails.root.join('spec/mixins/*.rb')].sort.each { |f| require f }
+Dir[Rails.root.join('spec/mixins/*.rb')].each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.s
diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index a6582c6aa5..d539eead93 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -20,7 +20,7 @@ def choose_suggestion(suggestion_text)
     # matching_element = find(:css, matcher) do |element|
     #   element.text.strip == suggestion_text.strip
     # end
-    matching_element = find('.ui-item-wrapper', text: suggestion_text.strip)
+    matching_element = all('.ui-item-wrapper', text: suggestion_text.strip)
     raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
 
     matching_element.click

From b4e7c104656cc2983ccf6a68e5607ad7c71492d3 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 08:28:04 -0700
Subject: [PATCH 43/95] tweak ruby version designation in gemfile to just
 specify major.minor version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d8f6a92d67..536b6312f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '>= 2.7.6'
+ruby '>= 2.7'
 
 # ===========#
 # CORE RAILS #

From 2502032de7c77d8a9f26e43a455fe78717a3bbff Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 10:06:07 -0700
Subject: [PATCH 44/95] ran bundle install and Version: 2.1.1

Usage: spring COMMAND [ARGS]

Commands for Spring itself:

  binstub         Generate Spring based binstubs. Use --all to generate a binstub for all known commands. Use --remove to revert.
  help            Print available commands.
  server          Explicitly start a Spring server in the foreground
  status          Show current status.
  stop            Stop all Spring processes for this project.

Commands for your application:

  rails           Run a rails command. The following sub commands will use Spring: console, runner, generate, destroy, test.
  rake            Runs the rake command
  rspec           Runs the rspec command to rebuild binstubs for the core rails components
---
 Gemfile.lock |  7 ++++++-
 bin/rails    |  5 +++++
 bin/rake     |  5 +++++
 bin/rspec    |  5 +++++
 bin/spring   | 34 +++++++++++-----------------------
 5 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5b8ef131e..c7477feffc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -270,6 +270,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     mocha (1.14.0)
     msgpack (1.5.2)
@@ -278,6 +279,9 @@ GEM
     mysql2 (0.5.4)
     nenv (0.3.0)
     nio4r (2.5.8)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -519,6 +523,7 @@ GEM
     zeitwerk (2.6.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -609,4 +614,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.15
+   2.3.10
diff --git a/bin/rails b/bin/rails
index 40b071ea57..bfa6cbda65 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 load File.expand_path("spring", __dir__)
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
diff --git a/bin/rake b/bin/rake
index a5c86fcf1f..e8aefa15ac 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 load File.expand_path("spring", __dir__)
 require_relative '../config/boot'
 require 'rake'
diff --git a/bin/rspec b/bin/rspec
index a6c78521d3..01397d929f 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 
 #
 # This file was generated by Bundler.
diff --git a/bin/spring b/bin/spring
index 4a9658806c..d89ee495fa 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,29 +1,17 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
-#
-# This file was generated by Bundler.
-#
-# The application 'spring' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# This file loads Spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
   end
 end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("spring", "spring")

From d54c68a7cf4c65dad42b2ef67242210667741790 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 11:57:19 -0700
Subject: [PATCH 45/95] discovered issue running specs on mysql. new version of
 mysqld considers uniqueness to be case sensitive, so added case insensitivity
 flag to models and specs. Also added indexes for these

---
 app/models/department.rb                            | 2 +-
 app/models/org.rb                                   | 3 ++-
 app/models/perm.rb                                  | 3 ++-
 app/models/question_format.rb                       | 3 ++-
 app/models/region.rb                                | 3 ++-
 db/migrate/20220614181654_add_uniqueness_indexes.rb | 9 +++++++++
 db/schema.rb                                        | 5 +++++
 spec/models/department_spec.rb                      | 1 +
 spec/models/org_spec.rb                             | 3 ++-
 spec/models/perm_spec.rb                            | 3 ++-
 spec/models/question_format_spec.rb                 | 3 ++-
 spec/models/region_spec.rb                          | 3 ++-
 12 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20220614181654_add_uniqueness_indexes.rb

diff --git a/app/models/department.rb b/app/models/department.rb
index a3c2a189a3..31d84bd755 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -30,7 +30,7 @@ class Department < ApplicationRecord
 
   validates :name, presence: { message: PRESENCE_MESSAGE },
                    uniqueness: { message: UNIQUENESS_MESSAGE,
-                                 scope: :org_id }
+                                 scope: :org_id, case_sensitive: false }
 
   validates :name, uniqueness: { message: UNIQUENESS_MESSAGE,
                                  scope: :org_id }
diff --git a/app/models/org.rb b/app/models/org.rb
index 756bb89fe5..b56a40e0b1 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -93,7 +93,8 @@ class Org < ApplicationRecord
   # ===============
 
   validates :name, presence: { message: PRESENCE_MESSAGE },
-                   uniqueness: { message: UNIQUENESS_MESSAGE }
+                   uniqueness: { message: UNIQUENESS_MESSAGE,
+                                 case_sensitive: false }
 
   validates :is_other, inclusion: { in: BOOLEAN_VALUES,
                                     message: PRESENCE_MESSAGE }
diff --git a/app/models/perm.rb b/app/models/perm.rb
index a95f6e6543..e30cd7705e 100644
--- a/app/models/perm.rb
+++ b/app/models/perm.rb
@@ -35,7 +35,8 @@ def lazy_load(name)
   # ===============
 
   validates :name, presence: { message: PRESENCE_MESSAGE },
-                   uniqueness: { message: UNIQUENESS_MESSAGE }
+                   uniqueness: { message: UNIQUENESS_MESSAGE,
+                                 case_sensitive: false }
 
   # =================
   # = Class methods =
diff --git a/app/models/question_format.rb b/app/models/question_format.rb
index 360da0e67e..803e5725f4 100644
--- a/app/models/question_format.rb
+++ b/app/models/question_format.rb
@@ -41,7 +41,8 @@ class QuestionFormat < ApplicationRecord
   # ===============
 
   validates :title, presence: { message: PRESENCE_MESSAGE },
-                    uniqueness: { message: UNIQUENESS_MESSAGE }
+                    uniqueness: { message: UNIQUENESS_MESSAGE,
+                                  case_sensitive: false }
 
   validates :description, presence: { message: PRESENCE_MESSAGE }
 
diff --git a/app/models/region.rb b/app/models/region.rb
index e091e3721b..83aed9b790 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -27,7 +27,8 @@ class Region < ApplicationRecord
   # ===============
 
   validates :name, presence: { message: PRESENCE_MESSAGE },
-                   uniqueness: { message: UNIQUENESS_MESSAGE }
+                   uniqueness: { message: UNIQUENESS_MESSAGE,
+                                 case_sensitive: false }
 
   validates :description, presence: true
 
diff --git a/db/migrate/20220614181654_add_uniqueness_indexes.rb b/db/migrate/20220614181654_add_uniqueness_indexes.rb
new file mode 100644
index 0000000000..8f75c7986b
--- /dev/null
+++ b/db/migrate/20220614181654_add_uniqueness_indexes.rb
@@ -0,0 +1,9 @@
+class AddUniquenessIndexes < ActiveRecord::Migration[6.1]
+  def change
+    add_index :departments, %i[name org_id], unique: true
+    add_index :orgs, :name, unique: true
+    add_index :perms, :name, unique: true
+    add_index :question_formats, :title, unique: true
+    add_index :regions, :abbreviation, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 56dbfef7d4..8220b3058d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -102,6 +102,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["org_id"], name: "index_departments_on_org_id"
+    t.index ["name", "org_id"], name: "index_departments_on_name_org_id"
   end
 
   create_table "exported_plans", id: :integer, force: :cascade do |t|
@@ -275,6 +276,7 @@
     t.text "api_create_plan_email_body"
     t.index ["language_id"], name: "fk_rails_5640112cab"
     t.index ["region_id"], name: "fk_rails_5a6adf6bab"
+    t.index ["name"], name: "index_orgs_on_name"
     t.string "helpdesk_email"
   end
 
@@ -282,6 +284,7 @@
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_perms_on_names"
   end
 
   create_table "phases", id: :integer, force: :cascade do |t|
@@ -355,6 +358,7 @@
     t.datetime "updated_at", null: false
     t.boolean "option_based", default: false
     t.integer "formattype", default: 0
+    t.index ["title"], name: "index_perms_on_titles"
   end
 
   create_table "question_options", id: :integer, force: :cascade do |t|
@@ -396,6 +400,7 @@
     t.string "description"
     t.string "name"
     t.integer "super_region_id"
+    t.index ["abbreviation"], name: "index_regions_on_abbreviations"
   end
 
   create_table "related_identifiers", force: :cascade do |t|
diff --git a/spec/models/department_spec.rb b/spec/models/department_spec.rb
index 9d79776f5a..9052c4de30 100644
--- a/spec/models/department_spec.rb
+++ b/spec/models/department_spec.rb
@@ -15,6 +15,7 @@
       subject = create(:department, org_id: org.id)
       expect(subject).to validate_uniqueness_of(:name)
         .scoped_to(:org_id)
+        .case_insensitive
         .with_message('must be unique')
     end
   end
diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 43a264f7db..00c090c4d6 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -8,7 +8,8 @@
 
     it {
       subject.name = 'DMP Company'
-      is_expected.to validate_uniqueness_of(:name).with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).case_insensitive
+                                                  .with_message('must be unique')
     }
 
     it { is_expected.to allow_values(true, false).for(:is_other) }
diff --git a/spec/models/perm_spec.rb b/spec/models/perm_spec.rb
index cb480b6ebf..39cb3c8a4e 100644
--- a/spec/models/perm_spec.rb
+++ b/spec/models/perm_spec.rb
@@ -24,7 +24,8 @@ def recreate_all
     it { is_expected.to validate_presence_of(:name) }
 
     it {
-      is_expected.to validate_uniqueness_of(:name).with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:name).case_insensitive
+                                                  .with_message('must be unique')
     }
   end
 
diff --git a/spec/models/question_format_spec.rb b/spec/models/question_format_spec.rb
index dc4068421e..59f375263d 100644
--- a/spec/models/question_format_spec.rb
+++ b/spec/models/question_format_spec.rb
@@ -7,7 +7,8 @@
     it { is_expected.to validate_presence_of(:title) }
 
     it {
-      is_expected.to validate_uniqueness_of(:title).with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:title).case_insensitive
+                                                   .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }
diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 9a5543eaef..3645ebdd65 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -7,7 +7,8 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
-      is_expected.to validate_uniqueness_of(:abbreviation).with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:abbreviation).case_insensitive
+                                                          .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }

From 20e6b0bab387da4f6196bf2c98d350b319ec7bed Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 15:30:00 -0700
Subject: [PATCH 46/95] finally fixed autocomplete/typeahead helper for specs

---
 lib/cleanup/deprecators/get_deprecator.rb     |  2 +-
 .../deprecators/predicate_deprecator.rb       |  2 +-
 lib/cleanup/deprecators/set_deprecator.rb     |  2 +-
 spec/features/plans_spec.rb                   | 39 ++++---------------
 spec/features/registrations_spec.rb           |  4 +-
 spec/features/super_admins/merge_org_spec.rb  |  9 ++---
 spec/features/super_admins/org_swaps_spec.rb  |  3 +-
 .../templates_upgrade_customisations_spec.rb  |  9 ++---
 spec/support/helpers/autocomplete_helper.rb   | 22 ++++++-----
 9 files changed, 31 insertions(+), 61 deletions(-)

diff --git a/lib/cleanup/deprecators/get_deprecator.rb b/lib/cleanup/deprecators/get_deprecator.rb
index 45c2fcd447..f8e45aaa7e 100644
--- a/lib/cleanup/deprecators/get_deprecator.rb
+++ b/lib/cleanup/deprecators/get_deprecator.rb
@@ -13,7 +13,7 @@ class GetDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information.".freeze
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/lib/cleanup/deprecators/predicate_deprecator.rb b/lib/cleanup/deprecators/predicate_deprecator.rb
index 8fd8774c90..a9d282a362 100644
--- a/lib/cleanup/deprecators/predicate_deprecator.rb
+++ b/lib/cleanup/deprecators/predicate_deprecator.rb
@@ -12,7 +12,7 @@ class PredicateDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information.".freeze
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/lib/cleanup/deprecators/set_deprecator.rb b/lib/cleanup/deprecators/set_deprecator.rb
index 294878fcb4..91a29d12e7 100644
--- a/lib/cleanup/deprecators/set_deprecator.rb
+++ b/lib/cleanup/deprecators/set_deprecator.rb
@@ -13,7 +13,7 @@ class SetDeprecator
       # Default message to display to developer when deprecated method called.
       MESSAGE = '%{deprecated_method} is deprecated. '\
                 'Instead, you should use: %{new_method}. '\
-                "Read #{__FILE__} for more information.".freeze
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
diff --git a/spec/features/plans_spec.rb b/spec/features/plans_spec.rb
index c8e5d5ed28..7e931771ac 100644
--- a/spec/features/plans_spec.rb
+++ b/spec/features/plans_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Plans', type: :feature do
+  include Webmocks
+
   before do
     @default_template = create(:template, :default, :published)
     @org = create(:org)
@@ -13,6 +15,8 @@
     @user         = create(:user, org: @org)
     sign_in(@user)
 
+    stub_openaire
+
     #     OpenURI.expects(:open_uri).returns(<<~XML
     #       <form-value-pairs>
     #         <value-pairs value-pairs-name="H2020projects" dc-term="relation">
@@ -28,54 +32,25 @@
     #     )
   end
 
-  xit 'User creates a new Plan', :js do
+  it 'User creates a new Plan', :js do
     # TODO: Revisit this after we start refactoring/building out or tests for
     #       the new create plan workflow. For some reason the plans/new.js isn't
     #       firing here but works fine in the UI with manual testing
     # Action
     click_link 'Create plan'
     fill_in :plan_title, with: 'My test plan'
-    fill_in :org_org_name, with: @research_org.name
-    choose_suggestion(@research_org.name)
+    choose_suggestion('plan_org_org_name', @research_org)
 
-    fill_in :funder_org_name, with: @funding_org.name
-    choose_suggestion(@funding_org.name)
+    choose_suggestion('plan_funder_org_name', @funding_org)
     click_button 'Create plan'
 
     # Expectations
     expect(@user.plans).to be_one
     @plan = Plan.last
     expect(current_path).to eql(plan_path(@plan))
-
-    ##
-    # User updates plan content...
-
-    # Action
     expect(page).to have_css("input[type=text][value='#{@plan.title}']")
-
-    within "#edit_plan_#{@plan.id}" do
-      fill_in 'Grant number', with: 'Innodia'
-      fill_in 'Project abstract', with: 'Plan abstract...'
-      fill_in 'ID', with: 'ABCDEF'
-      fill_in 'ORCID iD', with: 'My ORCID'
-      fill_in 'Phone', with: '07787 000 0000'
-      click_button 'Save'
-    end
-
-    # Reload the plan to get the latest from memory
-    @plan.reload
-
-    expect(current_path).to eql(overview_plan_path(@plan))
     expect(@plan.title).to eql('My test plan')
     expect(@plan.org_id).to eql(@research_org.id)
     expect(@plan.funder_id).to eql(@funding_org.id)
-    expect(@plan.grant_number).to eql('115797')
-    expect(@plan.description).to eql('Plan abstract...')
-    expect(@plan.identifier).to eql('ABCDEF')
-    name = [@user.firstname, @user.surname].join(' ')
-    expect(@plan.principal_investigator).to eql(name)
-    expect(@plan.principal_investigator_identifier).to eql('My ORCID')
-    expect(@plan.principal_investigator_email).to eql(@user.email)
-    expect(@plan.principal_investigator_phone).to eql('07787 000 0000')
   end
 end
diff --git a/spec/features/registrations_spec.rb b/spec/features/registrations_spec.rb
index c806a0d565..50ef4d60ab 100644
--- a/spec/features/registrations_spec.rb
+++ b/spec/features/registrations_spec.rb
@@ -18,7 +18,7 @@
       fill_in 'First Name', with: user_attributes[:firstname]
       fill_in 'Last Name', with: user_attributes[:surname]
       fill_in 'Email', with: user_attributes[:email]
-      select_an_org('#new_user_org_name', org)
+      choose_suggestion('new_user_org_name', org)
       fill_in 'Password', with: user_attributes[:password]
       check 'Show password'
       check 'I accept the terms and conditions'
@@ -41,7 +41,7 @@
       fill_in 'First Name', with: user_attributes[:firstname]
       fill_in 'Last Name', with: user_attributes[:surname]
       fill_in 'Email', with: 'invalid-email'
-      select_an_org('#new_user_org_name', org)
+      choose_suggestion('new_user_org_name', org)
       fill_in 'Password', with: user_attributes[:password]
       check 'Show password'
       check 'I accept the terms and conditions'
diff --git a/spec/features/super_admins/merge_org_spec.rb b/spec/features/super_admins/merge_org_spec.rb
index 10d95b9438..3e8338655a 100644
--- a/spec/features/super_admins/merge_org_spec.rb
+++ b/spec/features/super_admins/merge_org_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'SuperAdmins Merge Orgs', type: :feature, js: true do
+RSpec.describe 'SuperAdmins Merge Orgs', type: :feature do
   before do
     Org.destroy_all
     @scheme = create(:identifier_scheme)
@@ -27,7 +27,7 @@
     sign_in(@user)
   end
 
-  scenario 'Super admin merges an Org into another Org' do
+  scenario 'Super admin merges an Org into another Org', :js do
     org_name = @from_org.name
     click_link 'Admin'
     sleep(0.5)
@@ -43,10 +43,7 @@
     click_link 'Merge'
     sleep(0.3)
     expect(page).to have_text('Merge Organisations')
-    find('#org_org_name').click
-    fill_in(:org_org_name, with: @to_org.name[0..6])
-    sleep(0.8)
-    choose_suggestion(@to_org.name)
+    choose_suggestion('org_org_name', @to_org)
 
     click_button 'Analyze'
     # Wait for response
diff --git a/spec/features/super_admins/org_swaps_spec.rb b/spec/features/super_admins/org_swaps_spec.rb
index edf90939c6..ec9b23b373 100644
--- a/spec/features/super_admins/org_swaps_spec.rb
+++ b/spec/features/super_admins/org_swaps_spec.rb
@@ -21,8 +21,7 @@
     click_link 'Admin'
     click_link 'Templates'
     find('#superadmin_user_org_name').click
-    fill_in(:superadmin_user_org_name, with: @org2.name[0..4])
-    choose_suggestion(@org2.name)
+    choose_suggestion('superadmin_user_org_name', @org2)
     click_button 'Change affiliation'
     expect(current_path).to eql(org_admin_templates_path)
     expect(page).to have_text(@org2.name)
diff --git a/spec/features/templates/templates_upgrade_customisations_spec.rb b/spec/features/templates/templates_upgrade_customisations_spec.rb
index 0ab34a6f99..4aa8eb9abc 100644
--- a/spec/features/templates/templates_upgrade_customisations_spec.rb
+++ b/spec/features/templates/templates_upgrade_customisations_spec.rb
@@ -5,7 +5,7 @@
 RSpec.feature 'Templates::UpgradeCustomisations', type: :feature do
   let(:funder) { create(:org, :funder, name: 'The funder org') }
 
-  let(:org) { create(:org, :organisation, name: "The User's org") }
+  let(:org) { create(:org, :organisation, name: 'The User org') }
 
   let(:user) { create(:user, org: org) }
 
@@ -51,8 +51,7 @@
     expect(customized_template.reload.published?).to eql(true)
 
     # Move to the other funder Org's Templates
-    fill_in(:superadmin_user_org_name, with: funder.name)
-    choose_suggestion(funder.name)
+    choose_suggestion('superadmin_user_org_name', funder)
     click_button('Change affiliation')
 
     # Edit the original Template
@@ -92,9 +91,7 @@
     expect(new_funder_template.reload.published?).to eql(true)
 
     # Go back to the original Org...
-
-    fill_in(:superadmin_user_org_name, with: org.name)
-    choose_suggestion(org.name)
+    choose_suggestion('superadmin_user_org_name', org)
     click_button('Change affiliation')
 
     click_link 'Customisable Templates'
diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index d539eead93..0f1c782ac0 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -15,16 +15,18 @@ def select_an_org(autocomplete_id, org)
     page.execute_script(js) if hidden_id.present?
   end
 
-  def choose_suggestion(suggestion_text)
-    # matcher = '.ui-autocomplete .ui-menu-item'
-    # matching_element = find(:css, matcher) do |element|
-    #   element.text.strip == suggestion_text.strip
-    # end
-    matching_element = all('.ui-item-wrapper', text: suggestion_text.strip)
-    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
+  def choose_suggestion(typeahead_id, org)
+    # fill_in(:org_org_name, with: org.name)
+    fill_in(typeahead_id.to_sym, with: org.name)
 
-    matching_element.click
-    # Wait for the JS to run
-    sleep(0.3)
+    id = typeahead_id.gsub('_name', '_id')
+    # Some unfortunate hacks to deal with naming inconsistencies on the create plan page
+    # and the Super Admin merge orgs tab
+    id = id.gsub('org_org_', 'org_').gsub('funder_org_', 'funder_')
+    # Excape any single quotes so it doesn't blow up our JS
+    hash = { id: org.id, name: org.name.gsub("'", '') }
+    # Capybara/Selenium can't interact with a hidden field because the user can't,
+    # so use some JS to set the value
+    page.execute_script "document.getElementById('#{id}').value = '#{hash.to_json}';"
   end
 end

From 2085e7d84ca3c3f095f56df3365c06ae05a8ddc2 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 15:37:20 -0700
Subject: [PATCH 47/95] rubocop fixes and fix for index names in migration

---
 app/controllers/concerns/paginable.rb               |  2 +-
 app/models/language.rb                              |  2 +-
 app/models/settings/template.rb                     |  4 ++--
 db/migrate/20220614181654_add_uniqueness_indexes.rb | 10 +++++-----
 spec/mixins/versionable_model.rb                    |  2 +-
 spec/rails_helper.rb                                |  6 ++++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
index 3c89151fe2..71d3eacb01 100644
--- a/app/controllers/concerns/paginable.rb
+++ b/app/controllers/concerns/paginable.rb
@@ -8,7 +8,7 @@ module Paginable
 
   ##
   # Regex to validate sort_field param is safe
-  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]+$/
+  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]+$/.freeze
 
   PAGINATION_QUERY_PARAMS = %i[page sort_field sort_direction
                                search controller action].freeze
diff --git a/app/models/language.rb b/app/models/language.rb
index 3755e29bac..d08a701911 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -19,7 +19,7 @@ class Language < ApplicationRecord
 
   ABBREVIATION_MAXIMUM_LENGTH = 5
 
-  ABBREVIATION_FORMAT = /\A[a-z]{2}(-[A-Z]{2})?\Z/
+  ABBREVIATION_FORMAT = /\A[a-z]{2}(-[A-Z]{2})?\Z/.freeze
 
   NAME_MAXIMUM_LENGTH = 20
 
diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
index 21ef58b928..a0ee4c6377 100644
--- a/app/models/settings/template.rb
+++ b/app/models/settings/template.rb
@@ -21,8 +21,8 @@ class Template < RailsSettings::SettingObject
       'Arial, Helvetica, Sans-Serif'
     ].freeze
 
-    VALID_FONT_SIZE_RANGE = (8..14)
-    VALID_MARGIN_RANGE = (5..25)
+    VALID_FONT_SIZE_RANGE = (8..14).freeze
+    VALID_MARGIN_RANGE = (5..25).freeze
 
     VALID_ADMIN_FIELDS = %w[project_name project_identifier grant_title
                             principal_investigator project_data_contact
diff --git a/db/migrate/20220614181654_add_uniqueness_indexes.rb b/db/migrate/20220614181654_add_uniqueness_indexes.rb
index 8f75c7986b..0e7604ce24 100644
--- a/db/migrate/20220614181654_add_uniqueness_indexes.rb
+++ b/db/migrate/20220614181654_add_uniqueness_indexes.rb
@@ -1,9 +1,9 @@
 class AddUniquenessIndexes < ActiveRecord::Migration[6.1]
   def change
-    add_index :departments, %i[name org_id], unique: true
-    add_index :orgs, :name, unique: true
-    add_index :perms, :name, unique: true
-    add_index :question_formats, :title, unique: true
-    add_index :regions, :abbreviation, unique: true
+    add_index :departments, %i[name org_id], unique: true, name: 'unique_departments'
+    add_index :orgs, :name, unique: true, name: 'unique_orgs'
+    add_index :perms, :name, unique: true, name: 'unique_perms'
+    add_index :question_formats, :title, unique: true, name: 'unique_question_formats'
+    add_index :regions, :abbreviation, unique: true, name: 'unique_regions'
   end
 end
diff --git a/spec/mixins/versionable_model.rb b/spec/mixins/versionable_model.rb
index aa6ed1c9c1..66c6ce883f 100644
--- a/spec/mixins/versionable_model.rb
+++ b/spec/mixins/versionable_model.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-UUID_REGEX = /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i
+UUID_REGEX = /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i.freeze
 
 shared_examples_for 'VersionableModel' do
   context 'attributes' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 2aebe25948..f8408d8cad 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -24,9 +24,11 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].sort { |a, b| a <=> b }
+                                            .each { |f| require f }
 
-Dir[Rails.root.join('spec/mixins/*.rb')].each { |f| require f }
+Dir[Rails.root.join('spec/mixins/*.rb')].sort { |a, b| a <=> b }
+                                        .each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.s

From 343b9d0181668c3dc1acbff7ea6cc3f936fa7133 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 14 Jun 2022 15:45:00 -0700
Subject: [PATCH 48/95] fix for outdated db schema

---
 db/schema.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 8220b3058d..f73dde569e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_03_15_104737) do
+ActiveRecord::Schema.define(version: 2022_06_14_181654) do
 
   create_table "annotations", id: :integer, force: :cascade do |t|
     t.integer "question_id"
@@ -102,7 +102,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["org_id"], name: "index_departments_on_org_id"
-    t.index ["name", "org_id"], name: "index_departments_on_name_org_id"
+    t.index ["name", "org_id"], name: "unique_departments"
   end
 
   create_table "exported_plans", id: :integer, force: :cascade do |t|
@@ -276,7 +276,7 @@
     t.text "api_create_plan_email_body"
     t.index ["language_id"], name: "fk_rails_5640112cab"
     t.index ["region_id"], name: "fk_rails_5a6adf6bab"
-    t.index ["name"], name: "index_orgs_on_name"
+    t.index ["name"], name: "unique_orgs"
     t.string "helpdesk_email"
   end
 
@@ -284,7 +284,7 @@
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["name"], name: "index_perms_on_names"
+    t.index ["name"], name: "unique_perms"
   end
 
   create_table "phases", id: :integer, force: :cascade do |t|
@@ -358,7 +358,7 @@
     t.datetime "updated_at", null: false
     t.boolean "option_based", default: false
     t.integer "formattype", default: 0
-    t.index ["title"], name: "index_perms_on_titles"
+    t.index ["title"], name: "unique_question_formats"
   end
 
   create_table "question_options", id: :integer, force: :cascade do |t|
@@ -400,7 +400,7 @@
     t.string "description"
     t.string "name"
     t.integer "super_region_id"
-    t.index ["abbreviation"], name: "index_regions_on_abbreviations"
+    t.index ["abbreviation"], name: "unique_regions"
   end
 
   create_table "related_identifiers", force: :cascade do |t|

From 1dcf697b46740b8b4f93daa13297fa9387c32a89 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Wed, 15 Jun 2022 08:04:43 +0200
Subject: [PATCH 49/95] Removed case_sensitivity test on region abbreviation as
 this field is no longer case sentitive

---
 spec/models/region_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 3645ebdd65..9a5543eaef 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -7,8 +7,7 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
-      is_expected.to validate_uniqueness_of(:abbreviation).case_insensitive
-                                                          .with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:abbreviation).with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }

From 6096cf7e3e2ac40504d5afcef3cbdc537ee9ff7b Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 10:23:32 -0700
Subject: [PATCH 50/95] removed db migration that added unqiueness indexes

---
 db/migrate/20220614181654_add_uniqueness_indexes.rb | 9 ---------
 db/schema.rb                                        | 7 +------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 db/migrate/20220614181654_add_uniqueness_indexes.rb

diff --git a/db/migrate/20220614181654_add_uniqueness_indexes.rb b/db/migrate/20220614181654_add_uniqueness_indexes.rb
deleted file mode 100644
index 0e7604ce24..0000000000
--- a/db/migrate/20220614181654_add_uniqueness_indexes.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddUniquenessIndexes < ActiveRecord::Migration[6.1]
-  def change
-    add_index :departments, %i[name org_id], unique: true, name: 'unique_departments'
-    add_index :orgs, :name, unique: true, name: 'unique_orgs'
-    add_index :perms, :name, unique: true, name: 'unique_perms'
-    add_index :question_formats, :title, unique: true, name: 'unique_question_formats'
-    add_index :regions, :abbreviation, unique: true, name: 'unique_regions'
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index f73dde569e..56dbfef7d4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_06_14_181654) do
+ActiveRecord::Schema.define(version: 2022_03_15_104737) do
 
   create_table "annotations", id: :integer, force: :cascade do |t|
     t.integer "question_id"
@@ -102,7 +102,6 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["org_id"], name: "index_departments_on_org_id"
-    t.index ["name", "org_id"], name: "unique_departments"
   end
 
   create_table "exported_plans", id: :integer, force: :cascade do |t|
@@ -276,7 +275,6 @@
     t.text "api_create_plan_email_body"
     t.index ["language_id"], name: "fk_rails_5640112cab"
     t.index ["region_id"], name: "fk_rails_5a6adf6bab"
-    t.index ["name"], name: "unique_orgs"
     t.string "helpdesk_email"
   end
 
@@ -284,7 +282,6 @@
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["name"], name: "unique_perms"
   end
 
   create_table "phases", id: :integer, force: :cascade do |t|
@@ -358,7 +355,6 @@
     t.datetime "updated_at", null: false
     t.boolean "option_based", default: false
     t.integer "formattype", default: 0
-    t.index ["title"], name: "unique_question_formats"
   end
 
   create_table "question_options", id: :integer, force: :cascade do |t|
@@ -400,7 +396,6 @@
     t.string "description"
     t.string "name"
     t.integer "super_region_id"
-    t.index ["abbreviation"], name: "unique_regions"
   end
 
   create_table "related_identifiers", force: :cascade do |t|

From b50372676891a4921e6868d8ed693d147737bbfd Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 10:36:40 -0700
Subject: [PATCH 51/95] comment out rspec migration step

---
 spec/rails_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index f8408d8cad..a856d537d9 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -32,7 +32,10 @@
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.s
-ActiveRecord::Migration.maintain_test_schema!
+#
+# No need to run this during CI because we build the DB from the schema
+# ActiveRecord::Migration.maintain_test_schema!
+
 
 RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your

From 158cc5adc7e03bb3d9d0132c2a36e64b67e43bc1 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 10:57:08 -0700
Subject: [PATCH 52/95] updated github actions to use the binstubs

---
 .github/workflows/mysql.yml    | 18 ++++++------------
 .github/workflows/postgres.yml | 10 ++--------
 spec/rails_helper.rb           |  1 -
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 189a16ef12..042979447e 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -36,11 +36,11 @@ jobs:
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
-      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bin/rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
-      run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
+      run: echo "WICKED_PDF_PATH=`which wkhtmltopdf`" >> $GITHUB_ENV
 
     # Run yarn install for JS dependencies
     - name: 'Yarn Install'
@@ -62,19 +62,13 @@ jobs:
     - name: 'Precompile all of the Assets'
       run: bin/rails assets:precompile
 
-    # briley - comment out Karma tests due to issues with dependencies. We should
-    #          replace these with RSpec feature tests
-    # Run the JS tests
-    # - name: 'Run Karma Tests'
-    #   run: yarn test
-
     # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
-        bin/bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
-        bin/bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
-        bin/bundle exec rspec spec/mixins/
+        bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
+        bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
+        bin/rspec spec/mixins/
 
     # Run the time consuming integration tests (using Chrome headless browser)
     - name: 'Run Rspec Integration Tests'
-      run: bin/bundle exec rspec spec/features/
+      run: bin/rspec spec/features/
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index cdeebd324a..4af32823d8 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -60,11 +60,11 @@ jobs:
     - name: 'Setup Credentials'
       run: |
         # generate a default credential file and key
-        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+        EDITOR='echo "$(cat config/credentials.yml.example)" >' bin/rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
-      run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
+      run: echo "WICKED_PDF_PATH=`which wkhtmltopdf`" >> $GITHUB_ENV
 
     # Run yarn install for JS dependencies
     - name: 'Yarn Install'
@@ -81,12 +81,6 @@ jobs:
     - name: 'Compile Assets'
       run: bin/rails assets:precompile
 
-    # briley - comment out Karma tests due to issues with dependencies. We should
-    #          replace these with RSpec feature tests
-    # Run the JS tests
-    # - name: 'Run Karma Tests'
-    #   run: yarn test
-
     # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a856d537d9..34cc24cd3f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -36,7 +36,6 @@
 # No need to run this during CI because we build the DB from the schema
 # ActiveRecord::Migration.maintain_test_schema!
 
-
 RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

From 110475e47c7451e012f29aa91afa6b73f81fc935 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 11:07:43 -0700
Subject: [PATCH 53/95] try bundle exec instead of bin/ in github workflows

---
 .github/workflows/mysql.yml    | 18 +++++++++---------
 .github/workflows/postgres.yml | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 042979447e..6cc54855ec 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -36,11 +36,11 @@ jobs:
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
-      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bin/rails credentials:edit
+      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
-      run: echo "WICKED_PDF_PATH=`which wkhtmltopdf`" >> $GITHUB_ENV
+      run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
 
     # Run yarn install for JS dependencies
     - name: 'Yarn Install'
@@ -52,23 +52,23 @@ jobs:
 
     - name: 'Build out the test database'
       run: |
-        bin/rails db:create RAILS_ENV=test
-        bin/rails db:schema:load RAILS_ENV=test
+        bundle exec rails db:create RAILS_ENV=test
+        bundle exec rails db:schema:load RAILS_ENV=test
 
     - name: 'Run any pending database migrations'
       run: bin/rails db:migrate RAILS_ENV=test
 
     # Prebuild the CSS, JS and image assets
     - name: 'Precompile all of the Assets'
-      run: bin/rails assets:precompile
+      run: bundle exec rails assets:precompile
 
     # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
-        bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
-        bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
-        bin/rspec spec/mixins/
+        bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
+        bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
+        bundle exec rspec spec/mixins/
 
     # Run the time consuming integration tests (using Chrome headless browser)
     - name: 'Run Rspec Integration Tests'
-      run: bin/rspec spec/features/
+      run: bundle exec rspec spec/features/
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 4af32823d8..7d5c3978a1 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -60,11 +60,11 @@ jobs:
     - name: 'Setup Credentials'
       run: |
         # generate a default credential file and key
-        EDITOR='echo "$(cat config/credentials.yml.example)" >' bin/rails credentials:edit
+        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
-      run: echo "WICKED_PDF_PATH=`which wkhtmltopdf`" >> $GITHUB_ENV
+      run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
 
     # Run yarn install for JS dependencies
     - name: 'Yarn Install'
@@ -74,20 +74,20 @@ jobs:
     # Initialize the DB
     - name: 'Setup Test DB'
       run: |
-        bin/rails db:setup RAILS_ENV=test
-        bin/rails db:migrate RAILS_ENV=test
+        bundle exec rails db:setup RAILS_ENV=test
+        bundle exec rails db:migrate RAILS_ENV=test
 
     # Prebuild the CSS, JS and image assets
     - name: 'Compile Assets'
-      run: bin/rails assets:precompile
+      run: bundle exec rails assets:precompile
 
     # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
-        bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
-        bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
-        bin/rspec spec/mixins/
+        bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
+        bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
+        bundle exec rspec spec/mixins/
 
     # Run the time consuming integration tests (using Chrome headless browser)
     - name: 'Run Integration Tests'
-      run: bin/rspec spec/features/
+      run: bundle exec rspec spec/features/

From 538e3396d3919b91dce6cf0d0cdb5ab37f43fd5f Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 11:22:48 -0700
Subject: [PATCH 54/95] readd case_insensitive check to region

---
 spec/models/region_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 9a5543eaef..3645ebdd65 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -7,7 +7,8 @@
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
-      is_expected.to validate_uniqueness_of(:abbreviation).with_message('must be unique')
+      is_expected.to validate_uniqueness_of(:abbreviation).case_insensitive
+                                                          .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }

From 6aa7ca20e2d984ca6a42513d32931905b455973f Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 15 Jun 2022 11:37:12 -0700
Subject: [PATCH 55/95] updates to tests

---
 app/models/region.rb           | 3 ++-
 spec/factories/contributors.rb | 2 +-
 spec/models/region_spec.rb     | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/region.rb b/app/models/region.rb
index 83aed9b790..514671e44d 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -33,5 +33,6 @@ class Region < ApplicationRecord
   validates :description, presence: true
 
   validates :abbreviation, presence: { message: PRESENCE_MESSAGE },
-                           uniqueness: { message: UNIQUENESS_MESSAGE }
+                           uniqueness: { message: UNIQUENESS_MESSAGE,
+                                         case_sensitive: false }
 end
diff --git a/spec/factories/contributors.rb b/spec/factories/contributors.rb
index 729e0f72b2..c0f3e16f73 100644
--- a/spec/factories/contributors.rb
+++ b/spec/factories/contributors.rb
@@ -28,7 +28,7 @@
 FactoryBot.define do
   factory :contributor do
     org
-    name { Faker::Movies::StarWars.character }
+    name { Faker::Movies::StarWars.unique.character }
     email { Faker::Internet.unique.email }
     phone { Faker::PhoneNumber.phone_number_with_country_code }
 
diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 3645ebdd65..9d210c8165 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -14,6 +14,11 @@
     it { is_expected.to validate_presence_of(:description) }
 
     it { is_expected.to validate_presence_of(:name) }
+
+    it {
+      is_expected.to validate_uniqueness_of(:name).case_insensitive
+                                                  .with_message('must be unique')
+    }
   end
 
   context 'associations' do

From b7ace8f74e17ecc58e62dcf5b8a33c1676758943 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 17 Jun 2022 08:33:16 +0200
Subject: [PATCH 56/95] Unpegged mimemagic & pegged font-awesome gem to the
 major version

---
 Gemfile      |  6 +++---
 Gemfile.lock | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 536b6312f1..069e7da94f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'rails', '~> 6.1'
 #       an MIT license but was using some incompatible GPL license code.
 #       Versions of mimemagic that were yanked: https://rubygems.org/gems/mimemagic/versions
 #       Analysis of the issue: https://www.theregister.com/2021/03/25/ruby_rails_code/
-gem 'mimemagic', '~> 0.3.7'
+gem 'mimemagic'
 
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3', '~> 1.4'
@@ -158,7 +158,7 @@ gem 'api-pagination'
 gem 'sassc-rails'
 
 # Font-Awesome SASS (https://github.com/FortAwesome/font-awesome-sass)
-gem 'font-awesome-sass', '~> 5.13.0'
+gem 'font-awesome-sass', '~> 5'
 
 # Use webpack to manage app-like JavaScript modules in Rails
 # (https://github.com/rails/webpacker)
@@ -277,7 +277,7 @@ group :test do
 
   # Browser integration tests are expensive. We can mock external requests
   # in our tests, but once a browser is involved, we lose control.
-  gem 'capybara-webmock', '~> 0.6'
+  gem 'capybara-webmock'
 
   # RSpec::CollectionMatchers lets you express expected outcomes on
   # collections of an object in an example.
diff --git a/Gemfile.lock b/Gemfile.lock
index c7477feffc..ee8fa33126 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    font-awesome-sass (5.13.1)
+    font-awesome-sass (5.15.1)
       sassc (>= 1.11)
     formatador (1.1.0)
     forwardable (1.3.2)
@@ -266,12 +266,12 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mimemagic (0.3.10)
+    mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.0)
     mocha (1.14.0)
     msgpack (1.5.2)
     multi_json (1.15.0)
@@ -541,7 +541,7 @@ DEPENDENCIES
   byebug
   capybara
   capybara-screenshot
-  capybara-webmock (~> 0.6)
+  capybara-webmock
   contact_us
   database_cleaner
   devise
@@ -552,7 +552,7 @@ DEPENDENCIES
   factory_bot_rails
   faker
   flag_shih_tzu
-  font-awesome-sass (~> 5.13.0)
+  font-awesome-sass (~> 5)
   fuubar
   guard
   guard-rspec
@@ -563,7 +563,7 @@ DEPENDENCIES
   kaminari
   ledermann-rails-settings
   listen
-  mimemagic (~> 0.3.7)
+  mimemagic
   mocha
   mysql2
   omniauth
@@ -614,4 +614,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.10
+   2.3.15

From 71965be822d2d3e9fb75c9ab9a533224ff6692ad Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 17 Jun 2022 08:45:49 +0200
Subject: [PATCH 57/95] Replaced turbolinks (no longer maintained) by
 turbo-rails

---
 Gemfile                                | 6 ++++--
 Gemfile.lock                           | 9 +++++----
 app/javascript/packs/application.js    | 8 ++++----
 app/views/layouts/application.html.erb | 2 +-
 app/views/shared/_links.html.erb       | 2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 069e7da94f..17c3c67e46 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,10 @@ gem 'sass-rails'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
 gem 'webpacker'
 
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks'
+# Turbo gives you the speed of a single-page web application without having to write any JavaScript..
+# Read more: https://github.com/hotwired/turbo-rails
+#            https://github.com/hotwired/turbo-rails/blob/main/UPGRADING.md
+gem 'turbo-rails'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder'
diff --git a/Gemfile.lock b/Gemfile.lock
index ee8fa33126..d43dfc424b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -477,9 +477,10 @@ GEM
     tomparse (0.4.2)
     translation (1.32)
       gettext (~> 3.2, >= 3.2.5, <= 3.4.3)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
+    turbo-rails (1.1.1)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
@@ -599,7 +600,7 @@ DEPENDENCIES
   spring-watcher-listen
   text
   translation
-  turbolinks
+  turbo-rails
   web-console
   webdrivers
   webmock
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index f61459d552..802f33f005 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -86,14 +86,14 @@ import '../src/superAdmin/themes/newEdit';
 import '../src/superAdmin/users/edit';
 
 // Since we're using Webpacker to manage JS we need to startup Rails' Unobtrusive JS
-// and Turbolinks. ActiveStorage and ActionCable would also need to be in here
+// and Turbo. ActiveStorage and ActionCable would also need to be in here
 // if we decide to implement either before Rails 6
 require('@rails/ujs').start();
 
-// TODO: Disabled turbolinks for the time being because our custom JS is not
+// TODO: Disabled turbo for the time being because our custom JS is not
 //       properly setup to work with it. We should review the docs:
-//       https://github.com/turbolinks/turbolinks
-// require('turbolinks').start();
+//       https://github.com/hotwired/turbo-rails
+// import "@hotwired/turbo-rails".
 // require("@rails/activestorage").start()
 // require("@rails/actioncable").start()
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 079d6e3b34..889b85f939 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -61,7 +61,7 @@
     <![endif]-->
 
     <%= stylesheet_link_tag(stylesheet_manifest_file) %>
-    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_pack_tag 'application', 'data-turbo-track': 'reload' %>
     <%= csrf_meta_tags %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
diff --git a/app/views/shared/_links.html.erb b/app/views/shared/_links.html.erb
index 39af0acd0c..2dfaa8568d 100644
--- a/app/views/shared/_links.html.erb
+++ b/app/views/shared/_links.html.erb
@@ -1,7 +1,7 @@
 <%# locals: { context, title, links, max_number_links, tooltip } %>
 <div class="links" data-context="<%= context.present? ? context: 'default' %>"
                    data-max-number-links="<%= max_number_links %>"
-                   data-turbolinks="false">
+                   data-turbo="false">
   <div class="row">
     <div class="col-xs-12">
       <h3><%= title.present? ? title : _('Links') %>&nbsp;

From 310359cbf4100d9817481ae1ffb5a0776de03f5c Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 17 Jun 2022 09:09:27 +0200
Subject: [PATCH 58/95] Removed zaru gem and replaced it by built in
 ActiveStorage::Filename#sanitize method

---
 Gemfile                                    | 9 +++++----
 Gemfile.lock                               | 2 --
 app/controllers/plan_exports_controller.rb | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 17c3c67e46..f03f619843 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,8 @@ gem 'mimemagic'
 gem 'puma', group: :puma, require: false
 
 # Use SCSS for stylesheets
+# TODO : might need to move to cssbundling-rails
+# SEE: https://dev.to/kolide/how-to-migrate-a-rails-6-app-from-sass-rails-to-cssbundling-rails-4l41
 gem 'sass-rails'
 
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
@@ -62,6 +64,7 @@ gem 'bootsnap', require: false
 
 # Rollbar-gem is the SDK for Ruby apps and includes support for apps using
 # Rails, Sinatra, Rack, plain Ruby, and other frameworks.
+# https://github.com/rollbar/rollbar-gem
 gem 'rollbar', group: :rollbar, require: false
 
 # ======== #
@@ -95,6 +98,7 @@ gem 'devise_invitable'
 gem 'omniauth'
 
 # OmniAuth Shibboleth strategies for OmniAuth 1.x
+# https://github.com/toyokazu/omniauth-shibboleth
 gem 'omniauth-shibboleth'
 
 # ORCID OAuth 2.0 Strategy for OmniAuth 1.0
@@ -150,6 +154,7 @@ gem 'kaminari'
 
 # Paginate in your headers, not in your response body. This follows the
 # proposed RFC-8288 standard for Web linking.
+# https://github.com/davidcelis/api-pagination
 gem 'api-pagination'
 
 # =========== #
@@ -190,10 +195,6 @@ gem 'wicked_pdf'
 # (http://github.com/karnov/htmltoword)
 gem 'htmltoword'
 
-# Filename sanitization for Ruby. This is useful when you generate filenames for
-# downloads from user input
-gem 'zaru'
-
 # ==================== #
 # INTERNATIONALIZATION #
 # ==================== #
diff --git a/Gemfile.lock b/Gemfile.lock
index d43dfc424b..d0d653f6aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -520,7 +520,6 @@ GEM
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
-    zaru (0.3.0)
     zeitwerk (2.6.0)
 
 PLATFORMS
@@ -609,7 +608,6 @@ DEPENDENCIES
   wkhtmltopdf-binary
   yard
   yard-tomdoc
-  zaru
 
 RUBY VERSION
    ruby 2.7.6p219
diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index e442f3d60c..b034aa6b51 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -114,9 +114,9 @@ def show_json
   def file_name
     # Sanitize bad characters and replace spaces with underscores
     ret = @plan.title
-    Zaru.sanitize! ret
     ret = ret.strip.gsub(/\s+/, '_')
     ret = ret.gsub(/"/, '')
+    ret = ActiveStorage::Filename.new(ret).sanitized
     # limit the filename length to 100 chars. Windows systems have a MAX_PATH allowance
     # of 255 characters, so this should provide enough of the title to allow the user
     # to understand which DMP it is and still allow for the file to be saved to a deeply

From ac95461d8839dafba09917726e0f7a170ce566ad Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Fri, 17 Jun 2022 10:37:41 +0200
Subject: [PATCH 59/95] Commented some unused gems

---
 Gemfile      | 16 ++++++++--------
 Gemfile.lock | 34 ----------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/Gemfile b/Gemfile
index f03f619843..4406242641 100644
--- a/Gemfile
+++ b/Gemfile
@@ -242,11 +242,11 @@ group :test do
   # (https://github.com/thekompanee/fuubar)
   gem 'fuubar'
 
-  # Guard keeps an eye on your file modifications (http://guardgem.org)
+  # Guard keeps an eye on your file modifications (https://github.com/guard/guard)
   gem 'guard'
 
   # Guard gem for RSpec (https://github.com/guard/guard-rspec)
-  gem 'guard-rspec'
+  # gem 'guard-rspec'
 
   # Library for stubbing HTTP requests in Ruby.
   # (http://github.com/bblimke/webmock)
@@ -276,7 +276,7 @@ group :test do
 
   # Automatically create snapshots when Cucumber steps fail with Capybara
   # and Rails (http://github.com/mattheworiordan/capybara-screenshot)
-  gem 'capybara-screenshot'
+  # gem 'capybara-screenshot'
 
   # Browser integration tests are expensive. We can mock external requests
   # in our tests, but once a browser is involved, we lose control.
@@ -312,22 +312,22 @@ group :ci, :development do
   gem 'rubocop-i18n'
 
   # A collection of RuboCop cops to check for performance optimizations in Ruby code.
-  gem 'rubocop-performance'
+  # gem 'rubocop-performance'
 
   # Automatic Rails code style checking tool. A RuboCop extension focused on enforcing
   # Rails best practices and coding conventions.
-  gem 'rubocop-rails'
+  # gem 'rubocop-rails'
 
   # A RuboCop plugin for Rake tasks
-  gem 'rubocop-rake'
+  # gem 'rubocop-rake'
 
   # Code style checking for RSpec files. A plugin for the RuboCop code style enforcing
   # & linting tool.
-  gem 'rubocop-rspec'
+  # gem 'rubocop-rspec'
 
   # Thread-safety checks via static analysis. A plugin for the RuboCop code style
   # enforcing & linting tool.
-  gem 'rubocop-thread_safety'
+  # gem 'rubocop-thread_safety'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index d0d653f6aa..b3d9fe94bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,9 +104,6 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
-      capybara (>= 1.0, < 4)
-      launchy
     capybara-webmock (0.6.0)
       capybara (>= 2.4, < 4)
       rack (>= 1.4)
@@ -206,11 +203,6 @@ GEM
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
     hana (1.3.7)
     hashdiff (1.0.1)
     hashie (5.0.0)
@@ -246,8 +238,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    launchy (2.5.0)
-      addressable (~> 2.7)
     ledermann-rails-settings (2.5.0)
       activerecord (>= 4.2)
     listen (3.7.1)
@@ -383,10 +373,6 @@ GEM
       railties (>= 5.0)
     rexml (3.2.5)
     rollbar (3.3.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.11.0)
@@ -419,19 +405,6 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    rubocop-performance (1.14.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.0)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    rubocop-thread_safety (0.4.4)
-      rubocop (>= 0.53.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_dig (0.0.2)
@@ -540,7 +513,6 @@ DEPENDENCIES
   bundle-audit
   byebug
   capybara
-  capybara-screenshot
   capybara-webmock
   contact_us
   database_cleaner
@@ -555,7 +527,6 @@ DEPENDENCIES
   font-awesome-sass (~> 5)
   fuubar
   guard
-  guard-rspec
   htmltoword
   httparty
   jbuilder
@@ -585,11 +556,6 @@ DEPENDENCIES
   rspec-rails
   rubocop
   rubocop-i18n
-  rubocop-performance
-  rubocop-rails
-  rubocop-rake
-  rubocop-rspec
-  rubocop-thread_safety
   sass-rails
   sassc-rails
   selenium-webdriver

From f2c71dbe78fda4261d028ff650a548b5593301f3 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Fri, 17 Jun 2022 14:06:59 -0700
Subject: [PATCH 60/95] query optomizations based on feedback from Bullet

---
 app/controllers/contributors_controller.rb            |  2 +-
 app/controllers/guidances_controller.rb               |  7 ++++---
 app/controllers/org_admin/templates_controller.rb     |  6 +++---
 .../paginable/guidance_groups_controller.rb           |  2 +-
 app/controllers/paginable/guidances_controller.rb     |  3 +--
 app/controllers/paginable/plans_controller.rb         |  2 +-
 app/controllers/paginable/templates_controller.rb     |  8 ++++----
 app/controllers/paginable/users_controller.rb         |  4 ++--
 app/controllers/plans_controller.rb                   | 11 +++++------
 app/controllers/super_admin/orgs_controller.rb        |  2 +-
 app/controllers/users_controller.rb                   |  6 ++++--
 app/models/plan.rb                                    |  2 +-
 12 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/controllers/contributors_controller.rb b/app/controllers/contributors_controller.rb
index 3c210b63d4..410b95fd37 100644
--- a/app/controllers/contributors_controller.rb
+++ b/app/controllers/contributors_controller.rb
@@ -155,7 +155,7 @@ def process_orcid_for_update(hash:)
   # = Callbacks =
   # =============
   def fetch_plan
-    @plan = Plan.includes(:contributors).find_by(id: params[:plan_id])
+    @plan = Plan.find_by(id: params[:plan_id])
     return true if @plan.present?
 
     redirect_to root_path, alert: _('plan not found')
diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb
index ac0f1dc33b..7b6dc5e4c6 100644
--- a/app/controllers/guidances_controller.rb
+++ b/app/controllers/guidances_controller.rb
@@ -14,10 +14,11 @@ class GuidancesController < ApplicationController
   # GET /org/admin/guidance/:id/admin_index
   def admin_index
     authorize Guidance
-    @guidances = Guidance.by_org(current_user.org)
-                         .includes(:guidance_group, :themes).page(1)
+    @guidances = Guidance.includes(:guidance_group, :themes)
+                         .by_org(current_user.org).page(1)
     ensure_default_group(current_user.org)
-    @guidance_groups = GuidanceGroup.by_org(current_user.org).page(1)
+    @guidance_groups = GuidanceGroup.includes(:org)
+                                    .by_org(current_user.org).page(1)
   end
 
   # GET /org/admin/guidance/:id/admin_new
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index d845729b51..aed9d383dc 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -17,7 +17,7 @@ def index
       templates = Template.latest_version.where(customization_of: nil)
       published = templates.select { |t| t.published? || t.draft? }.length
 
-      @orgs              = Org.managed
+      @orgs              = Org.includes(:identifiers).managed
       @title             = _('All Templates')
       @templates         = templates.includes(:org).page(1)
       @query_params      = { sort_field: 'templates.title', sort_direction: 'asc' }
@@ -42,7 +42,7 @@ def organisational
                           .where(customization_of: nil, org_id: current_user.org.id)
       published = templates.select { |t| t.published? || t.draft? }.length
 
-      @orgs  = current_user.can_super_admin? ? Org.all : nil
+      @orgs  = current_user.can_super_admin? ? Org.includes(:identifiers).all : nil
       @title = if current_user.can_super_admin?
                  format(_('%{org_name} Templates'), org_name: current_user.org.name)
                else
@@ -80,7 +80,7 @@ def customisable
       end
       published = customizations.select { |t| t.published? || t.draft? }.length
 
-      @orgs = current_user.can_super_admin? ? Org.all : []
+      @orgs = current_user.can_super_admin? ? Org.includes(:identifiers).all : []
       @title = _('Customizable Templates')
       @templates = funder_templates
       @customizations = customizations
diff --git a/app/controllers/paginable/guidance_groups_controller.rb b/app/controllers/paginable/guidance_groups_controller.rb
index d001ecc68a..0eb68c02ff 100644
--- a/app/controllers/paginable/guidance_groups_controller.rb
+++ b/app/controllers/paginable/guidance_groups_controller.rb
@@ -10,7 +10,7 @@ def index
       authorize(Guidance)
       paginable_renderise(
         partial: 'index',
-        scope: GuidanceGroup.by_org(current_user.org),
+        scope: GuidanceGroup.includes(:org).by_org(current_user.org),
         query_params: { sort_field: 'guidance_groups.name', sort_direction: :asc },
         format: :json
       )
diff --git a/app/controllers/paginable/guidances_controller.rb b/app/controllers/paginable/guidances_controller.rb
index d97e00826a..ecbb718c08 100644
--- a/app/controllers/paginable/guidances_controller.rb
+++ b/app/controllers/paginable/guidances_controller.rb
@@ -10,8 +10,7 @@ def index
       authorize(Guidance)
       paginable_renderise(
         partial: 'index',
-        scope: Guidance.by_org(current_user.org)
-                      .includes(:guidance_group, :themes),
+        scope: Guidance.includes(:guidance_group, :themes).by_org(current_user.org),
         query_params: { sort_field: 'guidances.text', sort_direction: :asc },
         format: :json
       )
diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index b4ddbae87f..acdf1ae1af 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -11,7 +11,7 @@ def privately_visible
 
       paginable_renderise(
         partial: 'privately_visible',
-        scope: Plan.active(current_user),
+        scope: Plan.includes(:roles).active(current_user),
         query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
         format: :json
       )
diff --git a/app/controllers/paginable/templates_controller.rb b/app/controllers/paginable/templates_controller.rb
index 4456ffa00b..8e691519ca 100644
--- a/app/controllers/paginable/templates_controller.rb
+++ b/app/controllers/paginable/templates_controller.rb
@@ -13,18 +13,18 @@ class TemplatesController < ApplicationController
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     def index
       authorize Template
-      templates = Template.latest_version.where(customization_of: nil)
+      templates = Template.includes(:org).latest_version.where(customization_of: nil)
       case params[:f]
       when 'published'
         template_ids = templates.select { |t| t.published? || t.draft? }.collect(&:family_id)
-        templates = Template.latest_version(template_ids).where(customization_of: nil)
+        templates = Template.includes(:org).latest_version(template_ids).where(customization_of: nil)
       when 'unpublished'
         template_ids = templates.select { |t| !t.published? && !t.draft? }.collect(&:family_id)
-        templates = Template.latest_version(template_ids).where(customization_of: nil)
+        templates = Template.includes(:org).latest_version(template_ids).where(customization_of: nil)
       end
       paginable_renderise(
         partial: 'index',
-        scope: templates.includes(:org),
+        scope: templates,
         query_params: { sort_field: 'templates.title', sort_direction: :asc },
         locals: { action: 'index' },
         format: :json
diff --git a/app/controllers/paginable/users_controller.rb b/app/controllers/paginable/users_controller.rb
index 3da69b12cc..288fd08215 100644
--- a/app/controllers/paginable/users_controller.rb
+++ b/app/controllers/paginable/users_controller.rb
@@ -15,9 +15,9 @@ def index
       @filter_admin = params[:filter_admin] == '1'
 
       scope = if current_user.can_super_admin?
-                User.includes(:roles)
+                User.includes(:department, :org, :perms, :roles, :identifiers)
               else
-                current_user.org.users.includes(:roles)
+                current_user.org.users.includes(:department, :org, :perms, :roles, :identifiers)
               end
 
       scope = scope.joins(:perms).distinct if @filter_admin
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 7ddefde3fb..623cf2477f 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -15,7 +15,7 @@ class PlansController < ApplicationController
   # rubocop:disable Metrics/AbcSize
   def index
     authorize Plan
-    @plans = Plan.includes(:roles, :org).active(current_user).page(1)
+    @plans = Plan.includes(:roles).active(current_user).page(1)
     @organisationally_or_publicly_visible = if current_user.org.is_other?
                                               []
                                             else
@@ -162,8 +162,7 @@ def create
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def show
     @plan = Plan.includes(
-      template: { phases: { sections: { questions: :answers } } },
-      guidance_groups: :guidances
+      :guidance_groups, template: [:phases]
     ).find(params[:id])
     authorize @plan
 
@@ -174,7 +173,6 @@ def show
                   end
     # Get all of the available funders
     @funders = Org.funder
-                  .includes(identifiers: :identifier_scheme)
                   .joins(:templates)
                   .where(templates: { published: true }).uniq.sort_by(&:name)
     # TODO: Seems strange to do this. Why are we just not using an `edit` route?
@@ -192,8 +190,9 @@ def show
     if @all_ggs_grouped_by_org.include?(current_user.org)
       @important_ggs << [current_user.org, @all_ggs_grouped_by_org[current_user.org]]
     end
+    @default_orgs = Org.default_orgs
     @all_ggs_grouped_by_org.each do |org, ggs|
-      @important_ggs << [org, ggs] if Org.default_orgs.include?(org)
+      @important_ggs << [org, ggs] if @default_orgs.include?(org)
 
       # If this is one of the already selected guidance groups its important!
       @important_ggs << [org, ggs] if !(ggs & @selected_guidance_groups).empty? && !@important_ggs.include?([org, ggs])
@@ -229,7 +228,7 @@ def edit
       { template: {
         phases: {
           sections: {
-            questions: %i[question_format question_options annotations themes]
+            questions: %i[question_format annotations]
           }
         }
       } },
diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb
index 50ff0b421b..18fc1fa4b9 100644
--- a/app/controllers/super_admin/orgs_controller.rb
+++ b/app/controllers/super_admin/orgs_controller.rb
@@ -11,7 +11,7 @@ class OrgsController < ApplicationController
     def index
       authorize Org
       render 'index', locals: {
-        orgs: Org.includes(:contributors, :plans).with_template_and_user_counts.page(1)
+        orgs: Org.with_template_and_user_counts.page(1)
       }
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eca0e89eca..d3496e7221 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -21,9 +21,11 @@ def admin_index
         @filter_admin = false
 
         @users = if current_user.can_super_admin?
-                   User.includes(:roles).page(1)
+                   User.includes(:department, :org, :perms, :roles, :identifiers).page(1)
                  else
-                   current_user.org.users.includes(:roles).page(1)
+                   current_user.org.users
+                               .includes(:department, :org, :perms, :roles, :identifiers)
+                               .page(1)
                  end
       end
 
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 0bf4e69a58..7fbfce102a 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -101,7 +101,7 @@ class Plan < ApplicationRecord
 
   has_many :guidances, through: :themes
 
-  has_many :guidance_group_options, -> { distinct.published.reorder('id') },
+  has_many :guidance_group_options, -> { distinct.includes(:org).published.reorder('id') },
            through: :guidances,
            source: :guidance_group,
            class_name: 'GuidanceGroup'

From 80b2ac096688ae9916583dad9b82b561825f35ef Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Fri, 17 Jun 2022 14:18:57 -0700
Subject: [PATCH 61/95] attempt to fix randomly failing api v1 deserializer
 test

---
 spec/services/api/v1/deserialization/plan_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/api/v1/deserialization/plan_spec.rb b/spec/services/api/v1/deserialization/plan_spec.rb
index b99b265062..b7816f9e79 100644
--- a/spec/services/api/v1/deserialization/plan_spec.rb
+++ b/spec/services/api/v1/deserialization/plan_spec.rb
@@ -8,7 +8,7 @@
     create(:language, abbreviation: 'v1-plan', default_language: true) unless Language.default
 
     @template = create(:template)
-    @plan = create(:plan, template: @template)
+    @plan = create(:plan, template: @template, org: create(:org))
     @scheme = create(:identifier_scheme, name: 'doi',
                                          identifier_prefix: Faker::Internet.url)
     @doi = '10.9999/45ty5t.345/34t'

From aeb683cbb884c4a551bde117561207ad5615e635 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 10:18:31 +0200
Subject: [PATCH 62/95] Updated ESLint to V8 & replace eslint-loaded by
 eslint-plugin-import

---
 config/webpack/environment.js    |   18 +-
 config/webpack/loaders/eslint.js |    7 -
 package.json                     |   18 +-
 yarn.lock                        | 2252 +++++++++++++++---------------
 4 files changed, 1155 insertions(+), 1140 deletions(-)
 delete mode 100644 config/webpack/loaders/eslint.js

diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index b7eed32275..620aecc4c1 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -1,21 +1,23 @@
 const { environment } = require('@rails/webpacker');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const erb = require('./loaders/erb');
 const webpack = require('webpack');
-const eslint = require('./loaders/eslint');
 
 environment.loaders.prepend('erb', erb);
-environment.loaders.prepend('ESLint', eslint);
 
-environment.plugins.append('Provide', new webpack.ProvidePlugin({
-  $: 'jquery',
-  jQuery: 'jquery',
-  timeago: 'timeago.js',
-}));
+environment.plugins.append(
+  'Provide',
+  new webpack.ProvidePlugin({
+    $: 'jquery',
+    jQuery: 'jquery',
+    timeago: 'timeago.js',
+  }),
+  new ESLintPlugin(),
+);
 
 environment.config.set('resolve.alias', {
   'jquery-ui': 'jquery-ui/ui/widgets/',
   'bootstrap-sass': 'bootstrap-sass/assets/javascripts/bootstrap/',
 });
 
-environment.loaders.prepend('erb', erb)
 module.exports = environment;
diff --git a/config/webpack/loaders/eslint.js b/config/webpack/loaders/eslint.js
deleted file mode 100644
index be703ab956..0000000000
--- a/config/webpack/loaders/eslint.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// config/webpack/loaders/eslint.js
-module.exports = {
-  enforce: 'pre',
-  test: /\.(js|jsx)$/i,
-  exclude: /node_modules/,
-  loader: 'eslint-loader',
-};
diff --git a/package.json b/package.json
index 149fe44c5e..744cad1aac 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/DMPRoadmap/roadmap#readme",
   "dependencies": {
     "@babel/core": "^7.11.6",
+    "@hotwired/turbo-rails": "^7.1.3",
     "@rails/actioncable": "^6.0.3-1",
     "@rails/activestorage": "^6.0.3-1",
     "@rails/ujs": "^6.0.3-1",
@@ -34,10 +35,10 @@
     "bootstrap-select": "^1.13.18",
     "chart.js": "^2.9.4",
     "core-js": "^3.6.5",
-    "eslint": "^7.1.0",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.21.1",
+    "eslint": "^8.18.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-webpack-plugin": "^2.6.0",
     "jquery": "^3.5.1",
     "jquery-ui": "^1.12.1",
     "jquery-ui-sass": "^0.0.1",
@@ -48,14 +49,13 @@
     "regenerator-runtime": "^0.13.5",
     "timeago.js": "^4.0.2",
     "tinymce": "^5.10.0",
-    "turbolinks": "^5.2.0",
     "webpack": "^4.42.1"
   },
   "devDependencies": {
-    "eslint": "^7.1.0",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.21.1",
+    "eslint": "^8.18.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-webpack-plugin": "^2.6.0",
     "jasmine": "^3.5.0",
     "jasmine-core": "^3.5.0",
     "karma": "^6.3.14",
diff --git a/yarn.lock b/yarn.lock
index 8570a9a235..48737aad7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,18 +3,12 @@
 
 
 "@ampproject/remapping@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
-  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
-
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
-    "@babel/highlight" "^7.10.4"
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
@@ -23,40 +17,40 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
-  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.10":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.5.tgz#acac0c839e317038c73137fbb6ef71a1d6238471"
+  integrity sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==
 
 "@babel/core@^7.11.6", "@babel/core@^7.15.0":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a"
-  integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000"
+  integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.7"
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.8"
-    "@babel/parser" "^7.17.8"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
+    "@babel/parser" "^7.18.5"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.5"
+    "@babel/types" "^7.18.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.3", "@babel/generator@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
-  integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
+"@babel/generator@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.2"
+    "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
@@ -73,33 +67,33 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
-  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
+  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
+    "@babel/compat-data" "^7.17.10"
     "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
+    browserslist "^4.20.2"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
-  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
+  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
     "@babel/helper-optimise-call-expression" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd"
+  integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     regexpu-core "^5.0.1"
@@ -118,12 +112,10 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
 
 "@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
@@ -132,21 +124,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
@@ -155,7 +139,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.16.7":
+"@babel/helper-member-expression-to-functions@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
   integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
@@ -169,10 +153,10 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
-  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+"@babel/helper-module-transforms@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
+  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
@@ -180,8 +164,8 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.0"
+    "@babel/types" "^7.18.0"
 
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
@@ -190,10 +174,10 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
+  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
 
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
@@ -204,23 +188,23 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
+  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
     "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.2"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
@@ -256,69 +240,69 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.17.8":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106"
-  integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==
+"@babel/helpers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
+  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+"@babel/highlight@^7.16.7":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
+  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
-  integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
+"@babel/parser@^7.16.7", "@babel/parser@^7.18.5":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.5.tgz#337062363436a893a2d22faa60be5bb37091c83c"
+  integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
+  integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753"
+  integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+"@babel/plugin-proposal-async-generator-functions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03"
+  integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
+  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
-  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+"@babel/plugin-proposal-class-static-block@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710"
+  integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
@@ -329,36 +313,36 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+"@babel/plugin-proposal-export-namespace-from@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
+  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-json-strings@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664"
+  integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+"@babel/plugin-proposal-logical-assignment-operators@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
+  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
+  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-numeric-separator@^7.16.7":
@@ -369,16 +353,16 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
-  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8"
+  integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
   dependencies:
-    "@babel/compat-data" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.17.10"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.17.12"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.16.7":
   version "7.16.7"
@@ -388,40 +372,40 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
+  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+"@babel/plugin-proposal-private-methods@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
+  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+"@babel/plugin-proposal-private-property-in-object@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
+  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.17.12", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d"
+  integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -458,6 +442,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd"
+  integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.17.12"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -521,20 +512,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-transform-arrow-functions@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
+  integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-async-to-generator@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832"
+  integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
   dependencies:
     "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
 
 "@babel/plugin-transform-block-scoped-functions@^7.16.7":
@@ -544,40 +535,40 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-block-scoping@^7.17.12":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9"
+  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-classes@^7.17.12":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814"
+  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-replace-supers" "^7.18.2"
     "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f"
+  integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
-  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858"
+  integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.7"
@@ -587,12 +578,12 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c"
+  integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-exponentiation-operator@^7.16.7":
   version "7.16.7"
@@ -602,12 +593,12 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-for-of@^7.18.1":
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
+  integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-function-name@^7.16.7":
   version "7.16.7"
@@ -618,12 +609,12 @@
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-literals@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae"
+  integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-member-expression-literals@^7.16.7":
   version "7.16.7"
@@ -632,57 +623,58 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-modules-amd@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed"
+  integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19"
-  integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==
+"@babel/plugin-transform-modules-commonjs@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
+  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-simple-access" "^7.18.2"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
-  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
+"@babel/plugin-transform-modules-systemjs@^7.18.0":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz#87f11c44fbfd3657be000d4897e192d9cb535996"
+  integrity sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==
   dependencies:
     "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-modules-umd@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f"
+  integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931"
+  integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-new-target@^7.17.12":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz#8c228c4a07501dd12c95c5f23d1622131cc23931"
+  integrity sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-object-super@^7.16.7":
   version "7.16.7"
@@ -692,12 +684,12 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766"
+  integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-property-literals@^7.16.7":
   version "7.16.7"
@@ -706,27 +698,28 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5"
+  integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-reserved-words@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f"
+  integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-runtime@^7.15.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70"
-  integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz#f4d3188ba6a8815793993c71c2c225d0ee1d7743"
+  integrity sha512-Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA==
   dependencies:
     "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     babel-plugin-polyfill-corejs2 "^0.3.0"
     babel-plugin-polyfill-corejs3 "^0.5.0"
     babel-plugin-polyfill-regenerator "^0.3.0"
@@ -739,12 +732,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5"
+  integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
 "@babel/plugin-transform-sticky-regex@^7.16.7":
@@ -754,19 +747,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
+  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889"
+  integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.17.12"
 
 "@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
@@ -784,36 +777,37 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/preset-env@^7.15.0":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a"
+  integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==
   dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.17.12"
+    "@babel/plugin-proposal-class-properties" "^7.17.12"
+    "@babel/plugin-proposal-class-static-block" "^7.18.0"
     "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.17.12"
+    "@babel/plugin-proposal-json-strings" "^7.17.12"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12"
     "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.18.0"
     "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
+    "@babel/plugin-proposal-private-methods" "^7.17.12"
+    "@babel/plugin-proposal-private-property-in-object" "^7.17.12"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.17.12"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.17.12"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -823,44 +817,44 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
+    "@babel/plugin-transform-arrow-functions" "^7.17.12"
+    "@babel/plugin-transform-async-to-generator" "^7.17.12"
     "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.17.12"
+    "@babel/plugin-transform-classes" "^7.17.12"
+    "@babel/plugin-transform-computed-properties" "^7.17.12"
+    "@babel/plugin-transform-destructuring" "^7.18.0"
     "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.17.12"
     "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.18.1"
     "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.17.12"
     "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.18.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.2"
+    "@babel/plugin-transform-modules-systemjs" "^7.18.0"
+    "@babel/plugin-transform-modules-umd" "^7.18.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12"
+    "@babel/plugin-transform-new-target" "^7.17.12"
     "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.17.12"
     "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.18.0"
+    "@babel/plugin-transform-reserved-words" "^7.17.12"
     "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.17.12"
     "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.18.2"
+    "@babel/plugin-transform-typeof-symbol" "^7.17.12"
     "@babel/plugin-transform-unicode-escapes" "^7.16.7"
     "@babel/plugin-transform-unicode-regex" "^7.16.7"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
+    "@babel/types" "^7.18.2"
     babel-plugin-polyfill-corejs2 "^0.3.0"
     babel-plugin-polyfill-corejs3 "^0.5.0"
     babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    core-js-compat "^3.22.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -875,9 +869,9 @@
     esutils "^2.0.2"
 
 "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
-  integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -890,26 +884,26 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
-  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.5":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.5.tgz#94a8195ad9642801837988ab77f36e992d9a20cd"
+  integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/parser" "^7.18.5"
+    "@babel/types" "^7.18.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.18.4", "@babel/types@^7.4.4":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
+  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
@@ -924,19 +918,19 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
+  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.3.2"
+    globals "^13.15.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@gar/promisify@^1.0.1":
@@ -944,42 +938,85 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@hotwired/turbo-rails@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.3.tgz#a4e04ecb800a06e7f9aa6e298170fa4580b74216"
+  integrity sha512-6qKgn75bMWKx0bJgmSfrdC73EJkGLoSWZPAssvcd3nE7ZpDZff6f67j5OQNjjpRgNB7OFruom6VWguGQGu1fQg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@hotwired/turbo" "^7.1.0"
+    "@rails/actioncable" "^7.0"
+
+"@hotwired/turbo@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7"
+  integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA==
+
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
+  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
+  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
+  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
+
+"@jridgewell/set-array@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
+  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
+  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
+  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
-  integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
+  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
@@ -998,21 +1035,26 @@
     rimraf "^3.0.2"
 
 "@rails/actioncable@^6.0.3-1":
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.5.tgz#c24ec8123a8e7e239ceabda29078df9c93752394"
-  integrity sha512-bV4/Q7NweGFm7t3GvUFm19UF2WKmcvlOXy7AxMWEZCwDxQLagAXhUpKb1AJ6Rg88cPHqXSQHaGKr84lIMd607A==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.5.tgz#a889f25b0c13ea0215d747e32fa3d1a52967f17b"
+  integrity sha512-79sIsTpIoHnJ6pRHKaC6h5NMRpY+VZD4mqOKN/035X1ehxHgToDWvgMZ4jV5y1qeObg4enmNESmgeKoImYGzOw==
+
+"@rails/actioncable@^7.0":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b"
+  integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q==
 
 "@rails/activestorage@^6.0.3-1":
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.5.tgz#a43929573b2ffae54857ffa3b7ac1988af42b681"
-  integrity sha512-7L0eWqrguZIyvfPOpVoZRChuIgxbpBdwdVtprT6wrl5rUAbdyHr6AZczl1yS+5d6nBV0TqpVLaB1sGxi2aMbCQ==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.0.5.tgz#446e4b3f45bf1d4e1c6fd0b8b6e2566cb70c2b18"
+  integrity sha512-jp2UKh1QChjOGsApYO3HHuBH1yfv4mqOcKuB70fsT79O/CJWEACVnjKIdaqO+B9BJTKihaxyyepvL7kLfUFiDw==
   dependencies:
     spark-md5 "^3.0.0"
 
 "@rails/ujs@^6.0.3-1":
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.5.tgz#bb1afddd0d771f00924f44b21634969e329532e1"
-  integrity sha512-Ir4yd2fdDldWIghavPr874copVKf6OOoecKHZiFRlPtm38tFvhyxr+ywzNieXGwolF9JQe3D5GrM8ejkzUgh5Q==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.5.tgz#53e63a02271a7494a7925a30ed0a3672ec177337"
+  integrity sha512-6nEyc+7jhVQGx84sO7yalQq1G+ZgJa72/5q9Avsm4yIZqVymvLEftK90+B0XZhvJzbiNnbDIFC4Wx5mgHo7lTw==
 
 "@rails/webpacker@5.4.3":
   version "5.4.3"
@@ -1058,11 +1100,6 @@
     webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
-"@socket.io/base64-arraybuffer@~1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
-  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
-
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1108,10 +1145,23 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
+"@types/eslint@^7.28.2":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
+  integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
-  version "4.17.28"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
-  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  version "4.17.29"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c"
+  integrity sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1128,13 +1178,13 @@
     "@types/serve-static" "*"
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.8"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
-  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
+  integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
   dependencies:
     "@types/node" "*"
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -1142,7 +1192,7 @@
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/mime@^1":
   version "1.3.2"
@@ -1150,9 +1200,9 @@
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "17.0.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
-  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
+  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1174,10 +1224,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/retry@^0.12.0":
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
-  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+"@types/retry@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 "@types/serve-index@^1.9.1":
   version "1.9.1"
@@ -1186,7 +1236,7 @@
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*":
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
   version "1.13.10"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
   integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
@@ -1371,7 +1421,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -1381,15 +1431,10 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn@^8.5.0, acorn@^8.7.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -1433,7 +1478,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.8.0:
   version "8.11.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
   integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
@@ -1446,18 +1491,13 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
+  integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==
 
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
@@ -1515,10 +1555,15 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
 arr-flatten@^1.1.0:
   version "1.1.0"
@@ -1528,12 +1573,12 @@ arr-flatten@^1.1.0:
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-flatten@^2.1.2:
   version "2.1.2"
@@ -1541,29 +1586,46 @@ array-flatten@^2.1.2:
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-includes@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
+  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
 array.prototype.flat@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
-  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.reduce@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f"
+  integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.2"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
+
+arrify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
 asn1.js@^5.2.0:
   version "5.4.1"
@@ -1586,25 +1648,13 @@ assert@^1.1.1:
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1624,9 +1674,9 @@ autoprefixer@^9.6.1:
     postcss-value-parser "^4.1.0"
 
 babel-loader@^8.2.2:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b"
-  integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==
+  version "8.2.5"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
+  integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
   dependencies:
     find-cache-dir "^3.3.1"
     loader-utils "^2.0.0"
@@ -1704,7 +1754,7 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+  integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -1739,27 +1789,11 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
-body-parser@1.19.2:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
-    type-is "~1.6.18"
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@^1.19.0:
+body-parser@1.20.0, body-parser@^1.19.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
   integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
@@ -1778,24 +1812,24 @@ body-parser@^1.19.0:
     unpipe "1.0.0"
 
 bonjour-service@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.11.tgz#5418e5c1ac91c89a406f853a942e7892829c0d89"
-  integrity sha512-drMprzr2rDTCtgEE3VgdA9uUFaUHF+jXduwYSThHJnKMYM+FhI9Z3ph+TX3xy0LtgYHae6CHYPJ/2UnK8nQHcA==
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz#4ac003dc1626023252d58adf2946f57e5da450c1"
+  integrity sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==
   dependencies:
     array-flatten "^2.1.2"
     dns-equal "^1.0.0"
     fast-deep-equal "^3.1.3"
-    multicast-dns "^7.2.4"
+    multicast-dns "^7.2.5"
 
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 bootstrap-3-typeahead@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/bootstrap-3-typeahead/-/bootstrap-3-typeahead-4.0.2.tgz#cb1c969044856862096fc8c71cc21b3acbb50412"
-  integrity sha1-yxyWkESFaGIJb8jHHMIbOsu1BBI=
+  integrity sha512-cy1RiQ8wC1p8mM9D+hqlIZAc3llE8ddrF6lw6AhfhbF1YvqA0OrztZYMfPxPlZp1crEXE53IwyYNxehuAIWvew==
 
 bootstrap-sass@3.4.1:
   version "3.4.1"
@@ -1846,7 +1880,7 @@ braces@^3.0.2, braces@~3.0.2:
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
@@ -1909,15 +1943,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.6.4:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
-  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.20.4, browserslist@^4.6.4:
+  version "4.20.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
+  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
   dependencies:
-    caniuse-lite "^1.0.30001317"
-    electron-to-chromium "^1.4.84"
+    caniuse-lite "^1.0.30001349"
+    electron-to-chromium "^1.4.147"
     escalade "^3.1.1"
-    node-releases "^2.0.2"
+    node-releases "^2.0.5"
     picocolors "^1.0.0"
 
 buffer-from@^1.0.0:
@@ -1928,7 +1962,7 @@ buffer-from@^1.0.0:
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
 
 buffer@^4.3.0:
   version "4.9.2"
@@ -1942,12 +1976,12 @@ buffer@^4.3.0:
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+  integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
 bytes@3.1.2:
   version "3.1.2"
@@ -2025,21 +2059,21 @@ call-bind@^1.0.0, call-bind@^1.0.2:
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==
   dependencies:
     callsites "^2.0.0"
 
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==
   dependencies:
     caller-callsite "^2.0.0"
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+  integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -2061,10 +2095,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001317:
-  version "1.0.30001325"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz#2b4ad19b77aa36f61f2eaf72e636d7481d55e606"
-  integrity sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001349:
+  version "1.0.30001357"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz#dec7fc4158ef6ad24690d0eec7b91f32b8cb1b5d"
+  integrity sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
@@ -2222,7 +2256,7 @@ coa@^2.0.2:
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2244,7 +2278,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
@@ -2252,9 +2286,9 @@ color-name@^1.0.0, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.6.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
-  integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -2268,9 +2302,9 @@ color@^3.0.0:
     color-string "^1.6.0"
 
 colorette@^2.0.10:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
+  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -2280,7 +2314,7 @@ commander@^2.20.0:
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
@@ -2321,7 +2355,7 @@ compression@^1.7.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.5.0:
   version "1.6.2"
@@ -2361,7 +2395,7 @@ console-browserify@^1.1.0:
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+  integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
 
 content-disposition@0.5.4:
   version "0.5.4"
@@ -2385,9 +2419,14 @@ convert-source-map@^1.7.0:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.2, cookie@~0.4.1:
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
+cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
@@ -2407,20 +2446,20 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
-  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+core-js-compat@^3.21.0, core-js-compat@^3.22.1:
+  version "3.23.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b"
+  integrity sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==
   dependencies:
-    browserslist "^4.19.1"
+    browserslist "^4.20.4"
     semver "7.0.0"
 
 core-js@^3.16.2, core-js@^3.6.5:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
-  integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+  version "3.23.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
+  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2534,7 +2573,7 @@ css-blank-pseudo@^0.1.4:
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
+  integrity sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==
 
 css-declaration-sorter@^4.0.1:
   version "4.0.1"
@@ -2668,12 +2707,12 @@ cssnano-preset-default@^4.0.8:
 cssnano-util-get-arguments@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
-  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
+  integrity sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==
 
 cssnano-util-get-match@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
-  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
+  integrity sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==
 
 cssnano-util-raw-cache@^4.0.1:
   version "4.0.1"
@@ -2707,17 +2746,17 @@ csso@^4.0.2:
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
+  integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+  integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
 
-date-format@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.6.tgz#f6138b8f17968df9815b3d101fc06b0523f066c5"
-  integrity sha512-B9vvg5rHuQ8cbUXE/RMWMyX2YA5TecT3jKF5fLtGNlzPlU7zblSPmAm2OImDbWL+LDOQ6pUm+4LOFz+ywS41Zw==
+date-format@^4.0.10:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.11.tgz#ae0d1e069d7f0687938fd06f98c12f3a6276e526"
+  integrity sha512-VS20KRyorrbMCQmpdl2hg5KaOUsda1RbnsJg461FfrcyCUg+pkd0b40BSW4niQyTheww4DBXQnS7HwSrKkipLw==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
@@ -2726,14 +2765,14 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1, debug@^3.2.7:
+debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2743,12 +2782,12 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
 
 deep-is@^0.1.3:
   version "0.1.4"
@@ -2767,24 +2806,25 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
     is-descriptor "^1.0.0"
 
@@ -2804,7 +2844,7 @@ depd@2.0.0:
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 des.js@^1.0.0:
   version "1.0.1"
@@ -2819,15 +2859,10 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 detect-node@^2.0.4:
   version "2.1.0"
@@ -2837,7 +2872,7 @@ detect-node@^2.0.4:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
+  integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -2851,12 +2886,12 @@ diffie-hellman@^5.0.0:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
 
 dns-packet@^5.2.2:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d"
-  integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
@@ -2877,7 +2912,7 @@ doctrine@^3.0.0:
 dom-serialize@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
+  integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
@@ -2903,9 +2938,9 @@ domelementtype@1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domutils@^1.7.0:
   version "1.7.0"
@@ -2935,12 +2970,12 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.84:
-  version "1.4.104"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz#60973b0a7d398efa877196e8ccb0c93d48b918d8"
-  integrity sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ==
+electron-to-chromium@^1.4.147:
+  version "1.4.161"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz#49cb5b35385bfee6cc439d0a04fbba7a7a7f08a1"
+  integrity sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -2973,7 +3008,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
@@ -2983,16 +3018,14 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 engine.io-parser@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
-  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
-  dependencies:
-    "@socket.io/base64-arraybuffer" "~1.0.2"
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
+  integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
 
-engine.io@~6.1.0:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.3.tgz#f156293d011d99a3df5691ac29d63737c3302e6f"
-  integrity sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==
+engine.io@~6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.0.tgz#003bec48f6815926f2b1b17873e576acd54f41d0"
+  integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -3014,17 +3047,10 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
 
 entities@^2.0.0:
   version "2.2.0"
@@ -3045,31 +3071,46 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
-  integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
+es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
     get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
+    has-property-descriptors "^1.0.0"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
     is-callable "^1.2.4"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
     is-weakref "^1.0.2"
     object-inspect "^1.12.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -3088,26 +3129,27 @@ escalade@^3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-airbnb-base@^14.1.0:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"
-  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
+eslint-config-airbnb-base@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
+  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
   dependencies:
     confusing-browser-globals "^1.0.10"
     object.assign "^4.1.2"
-    object.entries "^1.1.2"
+    object.entries "^1.1.5"
+    semver "^6.3.0"
 
 eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
@@ -3117,17 +3159,6 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-loader@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-4.0.2.tgz#386a1e21bcb613b3cf2d252a3b708023ccfb41ec"
-  integrity sha512-EDpXor6lsjtTzZpLUn7KmXs02+nIjGcgees9BYjNkWra3jVq5vVa8IoCKgzT2M7dNNeoMBtaSG83Bd40N3poLw==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    fs-extra "^8.1.0"
-    loader-utils "^2.0.0"
-    object-hash "^2.0.3"
-    schema-utils "^2.6.5"
-
 eslint-module-utils@^2.7.3:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
@@ -3136,7 +3167,7 @@ eslint-module-utils@^2.7.3:
     debug "^3.2.7"
     find-up "^2.1.0"
 
-eslint-plugin-import@^2.21.1:
+eslint-plugin-import@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
   integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
@@ -3163,85 +3194,92 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
     esrecurse "^4.3.0"
-    estraverse "^4.1.1"
+    estraverse "^5.2.0"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+    eslint-visitor-keys "^2.0.0"
 
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@^7.1.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint-webpack-plugin@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.6.0.tgz#3bd4ada4e539cb1f6687d2f619073dbb509361cd"
+  integrity sha512-V+LPY/T3kur5QO3u+1s34VDTcRxjXWPUGM4hlmTb5DwVD0OQz631yGTxJZf4SpAqAjdbBVe978S8BJeHpAdOhQ==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@types/eslint" "^7.28.2"
+    arrify "^2.0.1"
+    jest-worker "^27.3.1"
+    micromatch "^4.0.4"
+    normalize-path "^3.0.0"
+    schema-utils "^3.1.1"
+
+eslint@^8.18.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd"
+  integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==
+  dependencies:
+    "@eslint/eslintrc" "^1.3.0"
+    "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.2"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    glob-parent "^6.0.1"
+    globals "^13.15.0"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.3.2:
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
+  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.7.1"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -3280,7 +3318,7 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -3318,7 +3356,7 @@ execa@^5.0.0:
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3331,42 +3369,43 @@ expand-brackets@^2.1.4:
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 express@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
+  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.0"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.10.3"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
     setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -3374,14 +3413,14 @@ express@^4.17.3:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3418,7 +3457,7 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 faye-websocket@^0.11.3:
   version "0.11.4"
@@ -3455,7 +3494,7 @@ file-uri-to-path@1.0.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3469,7 +3508,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.1.2, finalhandler@~1.1.2:
+finalhandler@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -3482,6 +3521,19 @@ finalhandler@1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    statuses "2.0.1"
+    unpipe "~1.0.0"
+
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -3503,7 +3555,7 @@ find-cache-dir@^3.3.1:
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
   dependencies:
     locate-path "^2.0.0"
 
@@ -3559,14 +3611,14 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.14.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 forwarded@0.2.0:
   version "0.2.0"
@@ -3576,41 +3628,32 @@ forwarded@0.2.0:
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
-  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+fs-extra@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -3618,7 +3661,7 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@1.0.3:
+fs-monkey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
@@ -3626,7 +3669,7 @@ fs-monkey@1.0.3:
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -3636,7 +3679,7 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^1.2.7:
   version "1.2.13"
@@ -3656,10 +3699,25 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -3672,13 +3730,13 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
+  integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.3"
 
 get-stream@^6.0.0:
   version "6.0.1"
@@ -3696,17 +3754,24 @@ get-symbol-description@^1.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -3714,14 +3779,14 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
     is-glob "^4.0.1"
 
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -3744,7 +3809,7 @@ global-modules@^2.0.0:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -3766,10 +3831,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+globals@^13.15.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
+  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
   dependencies:
     type-fest "^0.20.2"
 
@@ -3783,21 +3848,28 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -3813,7 +3885,7 @@ has-tostringtag@^1.0.0:
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -3822,7 +3894,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -3831,12 +3903,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -3873,7 +3945,7 @@ hex-color-regex@^1.1.0:
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -3889,7 +3961,7 @@ homedir-polyfill@^1.0.1:
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -3899,12 +3971,12 @@ hpack.js@^2.1.6:
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
-  integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
+  integrity sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==
 
 hsla-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
-  integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
+  integrity sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==
 
 html-entities@^2.3.2:
   version "2.3.3"
@@ -3914,18 +3986,7 @@ html-entities@^2.3.2:
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.1"
+  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -3941,7 +4002,7 @@ http-errors@2.0.0:
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -3954,9 +4015,9 @@ http-parser-js@>=0.5.1:
   integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==
 
 http-proxy-middleware@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a"
-  integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
+  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -3976,7 +4037,7 @@ http-proxy@^1.18.1:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+  integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==
 
 human-signals@^2.1.0:
   version "2.1.0"
@@ -4005,29 +4066,29 @@ ieee754@^1.1.4:
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+  integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
 immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  integrity sha512-Ew5AZzJQFqrOV5BTW3EIoHAnoie1LojZLXKcCQ/yTRyVZosBhK1x1ViYjHGf5pAFOq8ZyChZp6m/fSN7pJyZtg==
   dependencies:
     import-from "^2.1.0"
 
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==
   dependencies:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
@@ -4043,7 +4104,7 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  integrity sha512-0vdnLL2wSGnhlRmzHJAg5JHjt1l2vYhzJ7tNLGbeVg0fse56tpGaH0uzH+r9Slej+BSXXEHvBKDEnVSLLE9/+w==
   dependencies:
     resolve-from "^3.0.0"
 
@@ -4058,7 +4119,7 @@ import-local@^2.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
@@ -4068,7 +4129,7 @@ indent-string@^4.0.0:
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
+  integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
 
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
@@ -4078,7 +4139,7 @@ infer-owner@^1.0.3, infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4091,12 +4152,12 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+  integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==
 
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.4, ini@^1.3.5:
   version "1.3.8"
@@ -4130,12 +4191,12 @@ ipaddr.js@^2.0.1:
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
+  integrity sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
   dependencies:
     kind-of "^3.0.2"
 
@@ -4149,7 +4210,7 @@ is-accessor-descriptor@^1.0.0:
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-arrayish@^0.3.1:
   version "0.3.2"
@@ -4166,7 +4227,7 @@ is-bigint@^1.0.1:
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==
   dependencies:
     binary-extensions "^1.0.0"
 
@@ -4198,7 +4259,7 @@ is-callable@^1.1.4, is-callable@^1.2.4:
 is-color-stop@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
-  integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
+  integrity sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==
   dependencies:
     css-color-names "^0.0.4"
     hex-color-regex "^1.1.0"
@@ -4207,17 +4268,17 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+is-core-module@^2.8.1, is-core-module@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
+  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
   dependencies:
     has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
   dependencies:
     kind-of "^3.0.2"
 
@@ -4256,7 +4317,7 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+  integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
 
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
@@ -4266,7 +4327,7 @@ is-docker@^2.0.0, is-docker@^2.1.1:
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extendable@^1.0.1:
   version "1.0.1"
@@ -4278,12 +4339,12 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -4293,7 +4354,7 @@ is-fullwidth-code-point@^3.0.0:
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
   dependencies:
     is-extglob "^2.1.0"
 
@@ -4319,7 +4380,7 @@ is-number-object@^1.0.4:
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
     kind-of "^3.0.2"
 
@@ -4336,7 +4397,7 @@ is-obj@^2.0.0:
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-obj@^3.0.0:
   version "3.0.0"
@@ -4363,7 +4424,7 @@ is-resolvable@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-is-shared-array-buffer@^1.0.1:
+is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
@@ -4404,7 +4465,7 @@ is-windows@^1.0.1, is-windows@^1.0.2:
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
 
 is-wsl@^2.2.0:
   version "2.2.0"
@@ -4416,7 +4477,7 @@ is-wsl@^2.2.0:
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isbinaryfile@^4.0.8:
   version "4.0.10"
@@ -4426,19 +4487,19 @@ isbinaryfile@^4.0.8:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 jasmine-core@^3.5.0, jasmine-core@~3.99.0:
   version "3.99.1"
@@ -4462,10 +4523,19 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^27.3.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jquery-ui-sass@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/jquery-ui-sass/-/jquery-ui-sass-0.0.1.tgz#d117eb1a82fbf5072e6797e370c21b2446fb0861"
-  integrity sha1-0RfrGoL79QcuZ5fjcMIbJEb7CGE=
+  integrity sha512-O+59acNrMie/z/5xZghZ/JJ2cs2MUX1oUXP/z5ukyJuub4RKWrt34MywoYH9VECcduT39c8PgRR1YXbEy/A0Ng==
 
 jquery-ui@^1.12.1:
   version "1.13.1"
@@ -4497,6 +4567,13 @@ js-yaml@^3.13.1, js-yaml@^3.14.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -4505,7 +4582,7 @@ jsesc@^2.5.1:
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
@@ -4530,7 +4607,7 @@ json-schema-traverse@^1.0.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json5@^1.0.1:
   version "1.0.1"
@@ -4539,18 +4616,11 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
+json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -4575,12 +4645,12 @@ karma-chrome-launcher@^3.1.0:
 karma-fixture@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/karma-fixture/-/karma-fixture-0.2.6.tgz#971cea8c216d73f07043964cb73f10e0830018ef"
-  integrity sha1-lxzqjCFtc/BwQ5ZMtz8Q4IMAGO8=
+  integrity sha512-7jVtBtUclZ7r6BIn5YK3BQO6Xkgyo/v3K51BwXde9Fn884lHV0Gy+UhCzJxsioMh1jCRr0NO+Mkm6EsxdVxRKA==
 
 karma-html2js-preprocessor@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz#fc09edf04bbe2bb6eee9ba1968f826b7388020bd"
-  integrity sha1-/Ant8Eu+K7bu6boZaPgmtziAIL0=
+  integrity sha512-SiaPXNxIQjzBnxbi0mOT24zCzjFWBGaxWM/DqnEhp4WbI5kNpiZ35Jb/h7etrob+wiDSuDkltCuxE/fMSayqeQ==
 
 karma-jasmine@^3.3.1:
   version "3.3.1"
@@ -4597,7 +4667,7 @@ karma-jquery@^0.2.4:
 karma-json-fixtures-preprocessor@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/karma-json-fixtures-preprocessor/-/karma-json-fixtures-preprocessor-0.0.6.tgz#4f78a2ebcd34387f8e55ababff634655164c4c76"
-  integrity sha1-T3ii6800OH+OVaur/2NGVRZMTHY=
+  integrity sha512-weEt31YeOgui3Lmw1KYWgvkcjOb3Mr8xvB3SgjKg0wDlAGqCDhhXkff6UHaK5J0fIZzJMur18PqHMgzulM5bzA==
 
 karma-webpack@^4.0.2:
   version "4.0.2"
@@ -4612,9 +4682,9 @@ karma-webpack@^4.0.2:
     webpack-dev-middleware "^3.7.0"
 
 karma@^6.3.14:
-  version "6.3.17"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.17.tgz#5d963fb52463b73e1b5892ecb54c8f21bb04ba1d"
-  integrity sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508"
+  integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -4635,7 +4705,7 @@ karma@^6.3.14:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^4.2.0"
+    socket.io "^4.4.1"
     source-map "^0.6.1"
     tmp "^0.2.1"
     ua-parser-js "^0.7.30"
@@ -4644,14 +4714,14 @@ karma@^6.3.14:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
     is-buffer "^1.1.5"
 
@@ -4717,7 +4787,7 @@ loader-utils@^2.0.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -4740,58 +4810,53 @@ locate-path@^5.0.0:
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
 lodash.get@^4.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.has@^4.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
-  integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
+  integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.5:
+lodash@^4.17.21, lodash@^4.17.5:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log4js@^6.4.1:
-  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.4.tgz#c9bc75569f3f40bba22fe1bd0677afa7a6a13bac"
-  integrity sha512-ncaWPsuw9Vl1CKA406hVnJLGQKy1OHx6buk8J4rE2lVW+NW5Y82G5/DIloO7NkqLOUtNPEANaWC1kZYVjXssPw==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.5.2.tgz#9ae371e5b3cb3a3a209c24686e5547f8670834e5"
+  integrity sha512-DXtpNtt+KDOMT7RHUDIur/WsSA3rntlUh9Zg4XCdV42wUuMmbFkl38+LZ92Z5QvQA7mD5kAVkLiBSEH/tvUB8A==
   dependencies:
-    date-format "^4.0.6"
+    date-format "^4.0.10"
     debug "^4.3.4"
     flatted "^3.2.5"
     rfdc "^1.3.0"
-    streamroller "^3.0.6"
+    streamroller "^3.1.1"
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -4825,12 +4890,12 @@ make-dir@^3.0.2, make-dir@^3.1.0:
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
     object-visit "^1.0.0"
 
@@ -4856,19 +4921,19 @@ mdn-data@2.0.4:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
-  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+memfs@^3.4.3:
+  version "3.4.6"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.6.tgz#74097983d27c82b973665885dc75f27a65174510"
+  integrity sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==
   dependencies:
-    fs-monkey "1.0.3"
+    fs-monkey "^1.0.3"
 
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -4884,7 +4949,7 @@ memory-fs@^0.5.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -4894,7 +4959,7 @@ merge-stream@^2.0.0:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -4915,7 +4980,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -4976,9 +5041,9 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
 minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+  integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5012,9 +5077,9 @@ minipass-pipeline@^1.2.2:
     minipass "^3.0.0"
 
 minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d"
+  integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==
   dependencies:
     yallist "^4.0.0"
 
@@ -5063,14 +5128,14 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moment@^2.10.2:
-  version "2.29.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
-  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
+  integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -5082,7 +5147,7 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -5094,18 +5159,18 @@ ms@2.1.3, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multicast-dns@^7.2.4:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.4.tgz#cf0b115c31e922aeb20b64e6556cbeb34cf0dd19"
-  integrity sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw==
+multicast-dns@^7.2.5:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
+  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
   dependencies:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
 
 nan@^2.12.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
+  integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5127,7 +5192,7 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.3:
   version "0.6.3"
@@ -5178,15 +5243,15 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+node-releases@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -5198,12 +5263,12 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize-url@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+  integrity sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
@@ -5232,7 +5297,7 @@ nth-check@^1.0.2:
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+  integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==
 
 number-to-text@^0.3.8:
   version "0.3.9"
@@ -5242,28 +5307,23 @@ number-to-text@^0.3.8:
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-hash@^2.0.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-
 object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -5271,7 +5331,7 @@ object-keys@^1.0.12, object-keys@^1.1.1:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
     isobject "^3.0.0"
 
@@ -5285,7 +5345,7 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.2:
+object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
   integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
@@ -5295,18 +5355,19 @@ object.entries@^1.1.2:
     es-abstract "^1.19.1"
 
 object.getownpropertydescriptors@^2.1.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
-  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37"
+  integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==
   dependencies:
+    array.prototype.reduce "^1.0.4"
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
@@ -5334,7 +5395,7 @@ on-finished@2.4.1:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
@@ -5346,7 +5407,7 @@ on-headers@~1.0.2:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -5389,7 +5450,7 @@ optionator@^0.9.1:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+  integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
 
 p-limit@^1.1.0:
   version "1.3.0"
@@ -5415,7 +5476,7 @@ p-limit@^3.0.2:
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
   dependencies:
     p-limit "^1.1.0"
 
@@ -5441,17 +5502,17 @@ p-map@^4.0.0:
     aggregate-error "^3.0.0"
 
 p-retry@^4.5.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
-  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
+  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
-    "@types/retry" "^0.12.0"
+    "@types/retry" "0.12.0"
     retry "^0.13.1"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -5493,7 +5554,7 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -5511,7 +5572,7 @@ parse-json@^5.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
@@ -5521,7 +5582,7 @@ parseurl@~1.3.2, parseurl@~1.3.3:
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
 path-browserify@0.0.1:
   version "0.0.1"
@@ -5536,12 +5597,12 @@ path-complete-extname@^1.0.0:
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+  integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -5551,12 +5612,12 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -5571,7 +5632,7 @@ path-parse@^1.0.7:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -5607,7 +5668,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^4.0.1:
   version "4.0.1"
@@ -5640,19 +5701,10 @@ popper.js@^1.16.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
 postcss-attribute-case-insensitive@^4.0.1:
   version "4.0.2"
@@ -6302,7 +6354,7 @@ prelude-ls@^1.2.1:
 prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+  integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -6312,17 +6364,12 @@ process-nextick-args@~2.0.0:
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
 proxy-addr@~2.0.7:
   version "2.0.7"
@@ -6335,7 +6382,7 @@ proxy-addr@~2.0.7:
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -6377,12 +6424,12 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
 
 punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
 punycode@^2.1.0:
   version "2.1.1"
@@ -6392,7 +6439,7 @@ punycode@^2.1.0:
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
 qjobs@^1.2.0:
   version "1.2.0"
@@ -6406,15 +6453,10 @@ qs@6.10.3:
   dependencies:
     side-channel "^1.0.4"
 
-qs@6.9.7:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  integrity sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
@@ -6422,12 +6464,12 @@ query-string@^4.1.0:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+  integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
 
 rails-erb-loader@^5.5.2:
   version "5.5.2"
@@ -6457,16 +6499,6 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "1.8.1"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
@@ -6480,7 +6512,7 @@ raw-body@2.5.1:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
   dependencies:
     pify "^2.3.0"
 
@@ -6539,10 +6571,10 @@ regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5, regenerator-runtime@^0
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -6554,7 +6586,16 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^3.1.0:
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
+regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -6586,7 +6627,7 @@ regjsparser@^0.8.2:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
 repeat-element@^1.1.2:
   version "1.1.4"
@@ -6596,12 +6637,12 @@ repeat-element@^1.1.2:
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -6616,19 +6657,19 @@ require-main-filename@^2.0.0:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  integrity sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -6636,7 +6677,7 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+  integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==
 
 resolve-from@^4.0.0:
   version "4.0.0"
@@ -6646,14 +6687,14 @@ resolve-from@^4.0.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
 resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
-    is-core-module "^2.8.1"
+    is-core-module "^2.9.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -6675,12 +6716,12 @@ rfdc@^1.3.0:
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
-  integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
+  integrity sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==
 
 rgba-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
-  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
+  integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
@@ -6707,7 +6748,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==
   dependencies:
     aproba "^1.1.1"
 
@@ -6724,7 +6765,7 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
     ret "~0.1.10"
 
@@ -6745,9 +6786,9 @@ sass-loader@10.1.1:
     semver "^7.3.2"
 
 sass@^1.38.0:
-  version "1.49.11"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7"
-  integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==
+  version "1.52.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
+  integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -6776,7 +6817,7 @@ schema-utils@^2.6.5, schema-utils@^2.7.0:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0:
+schema-utils@^3.0.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -6798,7 +6839,7 @@ schema-utils@^4.0.0:
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
 selfsigned@^2.0.1:
   version "2.0.1"
@@ -6822,31 +6863,31 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^7.3.2, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     mime "1.6.0"
     ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -6865,7 +6906,7 @@ serialize-javascript@^5.0.1:
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -6875,20 +6916,20 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
@@ -6903,7 +6944,7 @@ set-value@^2.0.0, set-value@^2.0.1:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 setprototypeof@1.1.0:
   version "1.1.0"
@@ -6933,7 +6974,7 @@ shallow-clone@^3.0.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
@@ -6947,7 +6988,7 @@ shebang-command@^2.0.0:
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
   version "3.0.0"
@@ -6971,19 +7012,10 @@ signal-exit@^3.0.3:
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
   dependencies:
     is-arrayish "^0.3.1"
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -7014,10 +7046,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
-  integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==
+socket.io-adapter@~2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
+  integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
 socket.io-parser@~4.0.4:
   version "4.0.4"
@@ -7028,19 +7060,19 @@ socket.io-parser@~4.0.4:
     component-emitter "~1.3.0"
     debug "~4.3.1"
 
-socket.io@^4.2.0:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.4.1.tgz#cd6de29e277a161d176832bb24f64ee045c56ab8"
-  integrity sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==
+socket.io@^4.4.1:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.1.tgz#aa7e73f8a6ce20ee3c54b2446d321bbb6b1a9029"
+  integrity sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.2"
-    engine.io "~6.1.0"
-    socket.io-adapter "~2.3.3"
+    engine.io "~6.2.0"
+    socket.io-adapter "~2.4.0"
     socket.io-parser "~4.0.4"
 
-sockjs@^0.3.21:
+sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
   integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
@@ -7052,7 +7084,7 @@ sockjs@^0.3.21:
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+  integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==
   dependencies:
     is-plain-obj "^1.0.0"
 
@@ -7090,20 +7122,20 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+source-map@^0.7.3:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
 spark-md5@^3.0.0:
   version "3.0.2"
@@ -7143,7 +7175,7 @@ split-string@^3.0.1, split-string@^3.0.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -7167,7 +7199,7 @@ stable@^0.1.8:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -7177,10 +7209,10 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 stream-browserify@^2.0.1:
   version "2.0.2"
@@ -7214,19 +7246,19 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamroller@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.6.tgz#52823415800ded79a49aa3f7712f50a422b97493"
-  integrity sha512-Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg==
+streamroller@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.1.tgz#679aae10a4703acdf2740755307df0a05ad752e6"
+  integrity sha512-iPhtd9unZ6zKdWgMeYGfSBuqCngyJy1B/GPi/lTpwGpa3bajuX30GjUVd0/Tn/Xhg0mr4DOSENozz9Y06qyonQ==
   dependencies:
-    date-format "^4.0.6"
+    date-format "^4.0.10"
     debug "^4.3.4"
-    fs-extra "^10.0.1"
+    fs-extra "^10.1.0"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+  integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -7237,7 +7269,7 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7246,21 +7278,23 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -7293,7 +7327,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
@@ -7343,6 +7377,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -7367,17 +7408,6 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-table@^6.0.9:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -7435,19 +7465,19 @@ terser@^4.1.2:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca"
+  integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 through2@^2.0.0:
   version "2.0.5"
@@ -7477,12 +7507,12 @@ timers-browserify@^2.0.4:
 timsort@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
+  integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
 tinymce@^5.10.0:
-  version "5.10.4"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.4.tgz#24ee843c7648ade708605dec15d8dad07809f7db"
-  integrity sha512-L0ivAhGu7bEo6cUBrCzhtKlkIQqG2sTcL+uu7soMSxrECQIC5VwUnzp9HCEf+fRl36q6zavLV48lf8jelj+gXA==
+  version "5.10.5"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.5.tgz#02aef6a67e915f1559e51fa8fb007270d9666778"
+  integrity sha512-nFKtLhmoRtExBxUfv06JlkbQWux5D+d115vxSRAqUmccZdrtpFvOIYwZmikvulLdM9pfEpvO0B+RQ2qFV/+R7w==
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -7494,24 +7524,24 @@ tmp@^0.2.1:
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+  integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -7556,12 +7586,7 @@ tsconfig-paths@^3.14.1:
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-turbolinks@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/turbolinks/-/turbolinks-5.2.0.tgz#e6877a55ea5c1cb3bb225f0a4ae303d6d32ff77c"
-  integrity sha512-pMiez3tyBo6uRHFNNZoYMmrES/IaGgMhQQM+VFF36keryjb5ms0XkVpmKHkfW/4Vy96qiGW3K9bz0tF5sK9bBw==
+  integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -7586,21 +7611,21 @@ type-is@~1.6.18:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 ua-parser-js@^0.7.30:
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
   integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
@@ -7639,12 +7664,12 @@ union-value@^1.0.0:
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
 
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
+  integrity sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==
 
 unique-filename@^1.1.1:
   version "1.1.1"
@@ -7660,11 +7685,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -7673,17 +7693,17 @@ universalify@^2.0.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unquote@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+  integrity sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -7703,12 +7723,12 @@ uri-js@^4.2.2:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -7721,7 +7741,7 @@ use@^3.1.0:
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util.promisify@~1.0.0:
   version "1.0.1"
@@ -7736,7 +7756,7 @@ util.promisify@~1.0.0:
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==
   dependencies:
     inherits "2.0.1"
 
@@ -7750,7 +7770,7 @@ util@^0.11.0:
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^3.3.2:
   version "3.4.0"
@@ -7770,7 +7790,7 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vendors@^1.0.0:
   version "1.0.4"
@@ -7785,7 +7805,7 @@ vm-browserify@^1.0.1:
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+  integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
@@ -7854,25 +7874,26 @@ webpack-dev-middleware@^3.7.0:
     webpack-log "^2.0.0"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
-  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
+  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.1"
+    memfs "^3.4.3"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29"
-  integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz#c188db28c7bff12f87deda2a5595679ebbc3c9bc"
+  integrity sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
     "@types/express" "^4.17.13"
     "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
     "@types/ws" "^8.5.1"
     ansi-html-community "^0.0.8"
@@ -7889,12 +7910,11 @@ webpack-dev-server@^4.7.3:
     ipaddr.js "^2.0.1"
     open "^8.0.9"
     p-retry "^4.5.0"
-    portfinder "^1.0.28"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
     selfsigned "^2.0.1"
     serve-index "^1.9.1"
-    sockjs "^0.3.21"
+    sockjs "^0.3.24"
     spdy "^4.0.2"
     webpack-dev-middleware "^5.3.1"
     ws "^8.4.2"
@@ -7972,7 +7992,7 @@ which-boxed-primitive@^1.0.2:
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
 which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
@@ -8021,12 +8041,12 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.4.2:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769"
+  integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==
 
 ws@~8.2.3:
   version "8.2.3"

From cbbb17b372cec9c54b946473f59f585805eff580 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 10:46:17 +0200
Subject: [PATCH 63/95] Removed eslint-action as github has now everything to
 run ESLint

See : https://github.com/stefanoeb/eslint-action
---
 .github/workflows/eslint.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index b05c9807c9..494e96b236 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -20,9 +20,5 @@ jobs:
     - name: 'Yarn Install'
       run: yarn install
 
-    # Run the ES Lint checks on javascript files
-    #   https://github.com/marketplace/actions/run-eslint
-    - name: 'ES Lint checks'
-      uses: stefanoeb/eslint-action@1.0.0
-      with:
-        args: './app/javascript/**/*.js'
+    - name: 'Run ESLint'
+      run: eslint app/javascript/**/*.js --ext .js

From 695c66a6d4f95f10cad1d026b0ac7a6b0b9392f5 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 10:55:37 +0200
Subject: [PATCH 64/95] Fixed eslint action

---
 .github/workflows/eslint.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index 494e96b236..8c5ed2f65c 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -21,4 +21,6 @@ jobs:
       run: yarn install
 
     - name: 'Run ESLint'
-      run: eslint app/javascript/**/*.js --ext .js
+      run: yarn run eslint
+      with: 
+        args: 'app/javascript/**/*.js --ext .js'

From 648c80559c212ced93c16ed776683adf99615770 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 10:56:49 +0200
Subject: [PATCH 65/95] Fixed eslint action

---
 .github/workflows/eslint.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index 8c5ed2f65c..0a9756355d 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -21,6 +21,4 @@ jobs:
       run: yarn install
 
     - name: 'Run ESLint'
-      run: yarn run eslint
-      with: 
-        args: 'app/javascript/**/*.js --ext .js'
+      run: yarn run eslint app/javascript/**/*.js --ext .js

From d6904a5239bb8cc2d60481ec412d21e9df44bb72 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 11:22:22 +0200
Subject: [PATCH 66/95] Removed deprecated option from tinymce config

---
 app/javascript/src/utils/tinymce.js.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/src/utils/tinymce.js.erb b/app/javascript/src/utils/tinymce.js.erb
index ac5599941f..0d0ad822b1 100644
--- a/app/javascript/src/utils/tinymce.js.erb
+++ b/app/javascript/src/utils/tinymce.js.erb
@@ -36,7 +36,6 @@ export const defaultOptions = {
   extended_valid_elements: 'iframe[tooltip] , a[href|target=_blank]',
   paste_auto_cleanup_on_paste: true,
   paste_remove_styles: true,
-  paste_retain_style_properties: 'none',
   paste_convert_middot_lists: true,
   paste_remove_styles_if_webkit: true,
   paste_remove_spans: true,

From b7793464f5ece6e4a94f5d79a01a6799757267a3 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 11:53:03 +0200
Subject: [PATCH 67/95] Upgraded jasmine, jasmine-core & karma-jasmine. Fixed
 one of the autocomplete test

---
 app/javascript/src/utils/autoComplete.js |  1 +
 package.json                             |  6 ++---
 spec/javascripts/autoCompleteSpec.js     |  4 +++-
 yarn.lock                                | 28 ++++++++++++------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/javascript/src/utils/autoComplete.js b/app/javascript/src/utils/autoComplete.js
index f181a17f38..2021a47444 100644
--- a/app/javascript/src/utils/autoComplete.js
+++ b/app/javascript/src/utils/autoComplete.js
@@ -218,3 +218,4 @@ export const initAutocomplete = (selector) => {
     }
   }
 };
+export default initAutocomplete;
diff --git a/package.json b/package.json
index 744cad1aac..98f0e62ceb 100644
--- a/package.json
+++ b/package.json
@@ -56,14 +56,14 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-webpack-plugin": "^2.6.0",
-    "jasmine": "^3.5.0",
-    "jasmine-core": "^3.5.0",
+    "jasmine": "^4.2.1",
+    "jasmine-core": "^4.2.0",
     "karma": "^6.3.14",
     "karma-babel-preprocessor": "^8.0.1",
     "karma-chrome-launcher": "^3.1.0",
     "karma-fixture": "^0.2.6",
     "karma-html2js-preprocessor": "^1.1.0",
-    "karma-jasmine": "^3.3.1",
+    "karma-jasmine": "^5.1.0",
     "karma-jquery": "^0.2.4",
     "karma-json-fixtures-preprocessor": "^0.0.6",
     "karma-webpack": "^4.0.2",
diff --git a/spec/javascripts/autoCompleteSpec.js b/spec/javascripts/autoCompleteSpec.js
index 4a11501e5e..552d3f9735 100644
--- a/spec/javascripts/autoCompleteSpec.js
+++ b/spec/javascripts/autoCompleteSpec.js
@@ -7,9 +7,11 @@ describe('autoComplete test suite', () => {
     $('body').html(fixture.load('autoComplete.html'));
     initAutoComplete();
     // Override the form submission, we are just going to validate the ariatisation of the form
-    $('form').submit((e) => { e.preventDefault(); });
+    $('form').trigger('submit', (e) => { e.preventDefault(); });
   });
 
+  // TODO : Needs fixing, tests need to have at least one it() in a describe()
+
   afterEach(() => {
     fixture.cleanup();
     $('body').html('');
diff --git a/yarn.lock b/yarn.lock
index 48737aad7d..e65e4eb9ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4501,18 +4501,18 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-jasmine-core@^3.5.0, jasmine-core@~3.99.0:
-  version "3.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.99.1.tgz#5bfa4b2d76618868bfac4c8ff08bb26fffa4120d"
-  integrity sha512-Hu1dmuoGcZ7AfyynN3LsfruwMbxMALMka+YtZeGoLuDEySVmVAPaonkNoBRIw/ectu8b9tVQCJNgp4a4knp+tg==
+jasmine-core@^4.1.0, jasmine-core@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-4.2.0.tgz#0605bea284d6d78276f43c47de2532ecd4a73b00"
+  integrity sha512-OcFpBrIhnbmb9wfI8cqPSJ50pv3Wg4/NSgoZIqHzIwO/2a9qivJWzv8hUvaREIMYYJBas6AvfXATFdVuzzCqVw==
 
-jasmine@^3.5.0:
-  version "3.99.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.99.0.tgz#7cc7aeda7ade2d57694fc818a374f778cbb4ea62"
-  integrity sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==
+jasmine@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-4.2.1.tgz#55f81ab9d5d32f2645aa598d1356b6858407f4a9"
+  integrity sha512-LNZEKcScnjPRj5J92I1P515bxTvaHMRAERTyCoaGnWr87eOT6zv+b3M+kxKdH/06Gz4TnnXyHbXLiPtMHZ0ncw==
   dependencies:
     glob "^7.1.6"
-    jasmine-core "~3.99.0"
+    jasmine-core "^4.2.0"
 
 jest-worker@^26.5.0:
   version "26.6.2"
@@ -4652,12 +4652,12 @@ karma-html2js-preprocessor@^1.1.0:
   resolved "https://registry.yarnpkg.com/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz#fc09edf04bbe2bb6eee9ba1968f826b7388020bd"
   integrity sha512-SiaPXNxIQjzBnxbi0mOT24zCzjFWBGaxWM/DqnEhp4WbI5kNpiZ35Jb/h7etrob+wiDSuDkltCuxE/fMSayqeQ==
 
-karma-jasmine@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-3.3.1.tgz#c01b1a2ec973e1531c1f6535e1d7d66b8e4275c2"
-  integrity sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==
+karma-jasmine@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-5.1.0.tgz#3af4558a6502fa16856a0f346ec2193d4b884b2f"
+  integrity sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==
   dependencies:
-    jasmine-core "^3.5.0"
+    jasmine-core "^4.1.0"
 
 karma-jquery@^0.2.4:
   version "0.2.4"

From c56bca7c33a36d5548e074302fabe5bc0a239de6 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Mon, 20 Jun 2022 12:21:54 +0100
Subject: [PATCH 68/95] DCC Issue 710: The V0 API calls for assign_users and
 unassign_users to departments was broken.

DCC Issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/710

The fix involved making the following changes to the assign_users() and
unassign_users() methods in
app/controllers/api/v0/departments_controller.rb:
- Removed the previous redirect_to in each method and replaced it with
          render users_api_v0_departments_path
- Ensured the @users variable was set as follows
          @users = @user.org.users.includes(:department)
which is the way @users is set in the users() method in the controller.
The Json was called without this value during rendering.
---
 app/controllers/api/v0/departments_controller.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v0/departments_controller.rb b/app/controllers/api/v0/departments_controller.rb
index e573522b78..8048ac28a8 100644
--- a/app/controllers/api/v0/departments_controller.rb
+++ b/app/controllers/api/v0/departments_controller.rb
@@ -48,9 +48,8 @@ def assign_users
 
         assign_users_to(@department.id)
 
-        # Added "status: :see_other" to redirect_to (as we require rediect to be a GET).
-        # See https://makandracards.com/makandra/38347-redirecting-responses-for-patch-or-delete-will-not-redirect-with-get
-        redirect_to users_api_v0_departments_path, status: :see_other
+        @users = @user.org.users.includes(:department)
+        render users_api_v0_departments_path
       end
 
       ##
@@ -62,9 +61,8 @@ def unassign_users
 
         assign_users_to(nil)
 
-        # Added "status: :see_other" to redirect_to (as we require rediect to be a GET).
-        # See https://makandracards.com/makandra/38347-redirecting-responses-for-patch-or-delete-will-not-redirect-with-get
-        redirect_to users_api_v0_departments_path, status: :see_other
+        @users = @user.org.users.includes(:department)
+        render users_api_v0_departments_path
       end
 
       private

From e3a37d4a72d85701972a1d96ebb7e9739e82ab12 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 13:56:54 +0200
Subject: [PATCH 69/95] Upgraded chart.js to V3

---
 app/javascript/src/utils/charts.js | 32 +++++++++++++++++-------------
 package.json                       |  2 +-
 yarn.lock                          | 31 ++++-------------------------
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/app/javascript/src/utils/charts.js b/app/javascript/src/utils/charts.js
index 63e8088a59..364d15cd1e 100644
--- a/app/javascript/src/utils/charts.js
+++ b/app/javascript/src/utils/charts.js
@@ -1,4 +1,4 @@
-import Chart from 'chart.js';
+import Chart from 'chart.js/auto';
 
 // Set Aspect Rate (width of X-axis/height of Y-axis) based on
 // choice of selectedLastDayOfMonth in Time picker string value.  Note aspect
@@ -40,13 +40,14 @@ export const getAspectRatio = (diffInMonths) => {
 
 // Register a plugin for displaying a message for no data
 export const initializeCharts = () => {
-  Chart.plugins.register({
+  Chart.register({
+    id: 'no_data_label',
     afterDraw: (chart) => {
       if (chart.data.datasets.length === 0) {
         const { ctx, width, height } = {
-          ctx: chart.chart.ctx,
-          width: chart.chart.width,
-          height: chart.chart.height,
+          ctx: chart.ctx,
+          width: chart.width,
+          height: chart.height,
         };
         chart.clear();
         ctx.save();
@@ -72,8 +73,10 @@ export const createChart = (selector, data, appendTolabel = '', onClickHandler =
       }],
     },
     options: {
-      legend: {
-        display: false,
+      plugins: {
+        legend: {
+          display: false,
+        },
       },
       tooltips: {
         callbacks: {
@@ -81,9 +84,9 @@ export const createChart = (selector, data, appendTolabel = '', onClickHandler =
         },
       },
       scales: {
-        yAxes: [{
+        y: {
           ticks: { min: 0, suggestedMax: 50 },
-        }],
+        },
       },
       onClick: onClickHandler,
     },
@@ -94,20 +97,21 @@ export const createChart = (selector, data, appendTolabel = '', onClickHandler =
 export const drawHorizontalBar = (canvasSelector, data) => {
   const aspectRatio = getAspectRatio(data.labels.length);
   const chart = new Chart(canvasSelector, { // eslint-disable-line no-new
-    type: 'horizontalBar',
+    type: 'bar',
     data,
     options: {
+      indexAxis: 'y',
       responsive: true,
       maintainAspectRatio: true,
       aspectRatio,
       scales: {
-        xAxes: [{
+        x: {
           ticks: { beginAtZero: true, stepSize: 10 },
           stacked: true,
-        }],
-        yAxes: [{
+        },
+        y: {
           stacked: true,
-        }],
+        },
       },
     },
   });
diff --git a/package.json b/package.json
index 98f0e62ceb..d99a36a34f 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "bootstrap-3-typeahead": "^4.0.2",
     "bootstrap-sass": "3.4.1",
     "bootstrap-select": "^1.13.18",
-    "chart.js": "^2.9.4",
+    "chart.js": "^3.8.0",
     "core-js": "^3.6.5",
     "eslint": "^8.18.0",
     "eslint-config-airbnb-base": "^15.0.0",
diff --git a/yarn.lock b/yarn.lock
index e65e4eb9ec..ec8f019dcb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2122,28 +2122,10 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chart.js@^2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
-  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
-  dependencies:
-    chartjs-color "^2.1.0"
-    moment "^2.10.2"
-
-chartjs-color-string@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
-  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
-  dependencies:
-    color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
-  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
-  dependencies:
-    chartjs-color-string "^0.6.0"
-    color-convert "^1.9.3"
+chart.js@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.8.0.tgz#c6c14c457b9dc3ce7f1514a59e9b262afd6f1a94"
+  integrity sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg==
 
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.3:
   version "3.5.3"
@@ -5127,11 +5109,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.10.2:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
-  integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"

From ed74acbfc0e0a67d1dd7649cca9843a36fed6002 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 20 Jun 2022 14:06:50 +0200
Subject: [PATCH 70/95] Upgrade js-cookie to V3

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d99a36a34f..222397edf1 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "jquery": "^3.5.1",
     "jquery-ui": "^1.12.1",
     "jquery-ui-sass": "^0.0.1",
-    "js-cookie": "^2.2.1",
+    "js-cookie": "^3.0.1",
     "number-to-text": "^0.3.8",
     "popper.js": "^1.16.1",
     "rails-erb-loader": "^5.5.2",
diff --git a/yarn.lock b/yarn.lock
index ec8f019dcb..8409a568b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4531,10 +4531,10 @@ jquery-ui@^1.12.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-js-cookie@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
-  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+js-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
+  integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
 js-tokens@^4.0.0:
   version "4.0.0"

From bcccaeb4bb0e4e87ec3fe1c204e3dfab0487e51f Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Sun, 3 Jul 2022 07:25:38 -0700
Subject: [PATCH 71/95] replace deprecated 'resolved_paths' with
 'additional_paths' in webpacker.yml which was preventing asset compilation

---
 config/webpacker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpacker.yml b/config/webpacker.yml
index 6d0c3dba87..67a1d810f2 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -10,7 +10,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
+  additional_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false

From d6322efc56ba138570377056be91814e920e338a Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 4 Jul 2022 09:33:36 -0700
Subject: [PATCH 72/95] bumped dependencies

---
 Gemfile.lock |   37 +-
 yarn.lock    | 1381 +++++++++++++++++++++++++-------------------------
 2 files changed, 716 insertions(+), 702 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b3d9fe94bc..52759fa7d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -261,9 +261,9 @@ GEM
       rake
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.0)
+    minitest (5.16.2)
     mocha (1.14.0)
-    msgpack (1.5.2)
+    msgpack (1.5.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mysql2 (0.5.4)
@@ -277,19 +277,20 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.4.9)
+    oauth2 (2.0.4)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+      rash_alt (>= 0.4, < 1)
+      version_gem (~> 1.1)
     omniauth (2.1.0)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
     omniauth-orcid (2.1.1)
       omniauth-oauth2 (~> 1.3)
       ruby_dig (~> 0.0.2)
@@ -303,7 +304,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.3.5)
+    pg (1.4.1)
     prime (0.1.2)
       forwardable
       singleton
@@ -321,15 +322,15 @@ GEM
     pundit-matchers (1.7.0)
       rspec-rails (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-protection (2.2.0)
       rack
     rack-proxy (0.7.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails (6.1.6)
       actioncable (= 6.1.6)
       actionmailbox (= 6.1.6)
@@ -362,6 +363,8 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -372,7 +375,7 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rollbar (3.3.0)
+    rollbar (3.3.1)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.11.0)
@@ -392,7 +395,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.30.1)
+    rubocop (1.31.1)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -437,7 +441,7 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (4.0.3)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -456,9 +460,10 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     uniform_notifier (1.16.0)
     uri_template (0.7.0)
+    version_gem (1.1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -579,4 +584,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.15
+   2.3.10
diff --git a/yarn.lock b/yarn.lock
index 8409a568b6..9b79403037 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,93 +10,93 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
-    "@babel/highlight" "^7.16.7"
+    "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.10":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.5.tgz#acac0c839e317038c73137fbb6ef71a1d6238471"
-  integrity sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.6.tgz#8b37d24e88e8e21c499d4328db80577d8882fa53"
+  integrity sha512-tzulrgDT0QD6U7BJ4TKVk2SDDg7wlP39P9yAx1RfLy7vP/7rsDRlWVfbWxElslu56+r7QOhB2NSDsabYYruoZQ==
 
 "@babel/core@^7.11.6", "@babel/core@^7.15.0":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000"
-  integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.6.tgz#54a107a3c298aee3fe5e1947a6464b9b6faca03d"
+  integrity sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.2"
-    "@babel/helper-compilation-targets" "^7.18.2"
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helpers" "^7.18.2"
-    "@babel/parser" "^7.18.5"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.5"
-    "@babel/types" "^7.18.4"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helpers" "^7.18.6"
+    "@babel/parser" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
-  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
+"@babel/generator@^7.18.6":
+  version "7.18.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.7.tgz#2aa78da3c05aadfc82dbac16c99552fc802284bd"
+  integrity sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==
   dependencies:
-    "@babel/types" "^7.18.2"
-    "@jridgewell/gen-mapping" "^0.3.0"
+    "@babel/types" "^7.18.7"
+    "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz#f14d640ed1ee9246fb33b8255f08353acfe70e6a"
+  integrity sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
-  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz#18d35bfb9f83b1293c22c55b3d576c1315b6ed96"
+  integrity sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==
   dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
     browserslist "^4.20.2"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
-  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
+"@babel/helper-create-class-features-plugin@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz#6f15f8459f3b523b39e00a99982e2c040871ed72"
+  integrity sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-member-expression-to-functions" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd"
-  integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
+  integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.1.0"
 
 "@babel/helper-define-polyfill-provider@^0.3.1":
   version "0.3.1"
@@ -112,300 +112,302 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
-  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
-
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+"@babel/helper-environment-visitor@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz#b7eee2b5b9d70602e59d1a6cad7dd24de7ca6cd7"
+  integrity sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==
+
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
-  dependencies:
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
-  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
-  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
-
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
-  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.18.2"
-    "@babel/types" "^7.18.2"
-
-"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
-  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
-  dependencies:
-    "@babel/types" "^7.18.2"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helpers@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
-  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.2"
-    "@babel/types" "^7.18.2"
-
-"@babel/highlight@^7.16.7":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
-  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-function-name@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz#8334fecb0afba66e6d87a7e8c6bb7fed79926b83"
+  integrity sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-member-expression-to-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz#44802d7d602c285e1692db0bad9396d007be2afc"
+  integrity sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-transforms@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.6.tgz#57e3ca669e273d55c3cda55e6ebf552f37f483c8"
+  integrity sha512-L//phhB4al5uucwzlimruukHB3jRd5JGClwRMD/ROrVjXfLqovYnvQrK/JK36WYyVwGGO7OD3kMyVTjx+WVPhw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz#9448974dd4fb1d80fefe72e8a0af37809cd30d6d"
+  integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==
+
+"@babel/helper-remap-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz#fa1f81acd19daee9d73de297c0308783cd3cfc23"
+  integrity sha512-z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-wrap-function" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-replace-supers@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz#efedf51cfccea7b7b8c0f00002ab317e7abfe420"
+  integrity sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-member-expression-to-functions" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-simple-access@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
+  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz#7dff00a5320ca4cf63270e5a0eca4b268b7380d9"
+  integrity sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+
+"@babel/helper-validator-option@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz#ec44ea4ad9d8988b90c3e465ba2382f4de81a073"
+  integrity sha512-I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw==
+  dependencies:
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helpers@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.6.tgz#4c966140eaa1fcaa3d5a8c09d7db61077d4debfd"
+  integrity sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.18.5":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.5.tgz#337062363436a893a2d22faa60be5bb37091c83c"
-  integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==
+"@babel/parser@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.6.tgz#845338edecad65ebffef058d3be851f1d28a63bc"
+  integrity sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
-  integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753"
-  integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6.tgz#b4e4dbc2cd1acd0133479918f7c6412961c9adb8"
+  integrity sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.6"
 
-"@babel/plugin-proposal-async-generator-functions@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03"
-  integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
+"@babel/plugin-proposal-async-generator-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz#aedac81e6fc12bb643374656dd5f2605bf743d17"
+  integrity sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
-  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710"
-  integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
-  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
+"@babel/plugin-proposal-export-namespace-from@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz#1016f0aa5ab383bbf8b3a85a2dcaedf6c8ee7491"
+  integrity sha512-zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664"
-  integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
-  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz#3b9cac6f1ffc2aa459d111df80c12020dfc6b665"
+  integrity sha512-zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
-  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8"
-  integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz#ec93bba06bfb3e15ebd7da73e953d84b094d5daf"
+  integrity sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw==
   dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.17.10"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.17.12"
+    "@babel/plugin-transform-parameters" "^7.18.6"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
-  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
+"@babel/plugin-proposal-optional-chaining@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz#46d4f2ffc20e87fad1d98bc4fa5d466366f6aa0b"
+  integrity sha512-PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
-  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
-  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
+  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.17.12", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d"
-  integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -442,12 +444,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd"
-  integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==
+"@babel/plugin-syntax-import-assertions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4"
+  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -512,302 +514,302 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
-  integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832"
-  integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.17.12":
-  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9"
-  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
+"@babel/plugin-transform-block-scoping@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz#b5f78318914615397d86a731ef2cc668796a726c"
+  integrity sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-classes@^7.17.12":
-  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814"
-  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
+"@babel/plugin-transform-classes@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.6.tgz#3501a8f3f4c7d5697c27a3eedbee71d68312669f"
+  integrity sha512-XTg8XW/mKpzAF3actL554Jl/dOYoJtv3l8fxaEczpgz84IeeVf+T1u2CSvPHuZbt0w3JkIx4rdn/MRQI7mo0HQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-replace-supers" "^7.18.2"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f"
-  integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
+"@babel/plugin-transform-computed-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz#5d15eb90e22e69604f3348344c91165c5395d032"
+  integrity sha512-9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858"
-  integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz#a98b0e42c7ffbf5eefcbcf33280430f230895c6f"
+  integrity sha512-tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c"
-  integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
+"@babel/plugin-transform-duplicate-keys@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz#e6c94e8cd3c9dd8a88144f7b78ae22975a7ff473"
+  integrity sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.18.1":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
-  integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
+"@babel/plugin-transform-for-of@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.6.tgz#e0fdb813be908e91ccc9ec87b30cc2eabf046f7c"
+  integrity sha512-WAjoMf4wIiSsy88KmG7tgj2nFdEK7E46tArVtcgED7Bkj6Fg/tG5SbvNIOKxbFS2VFgNh6+iaPswBeQZm4ox8w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-function-name@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz#6a7e4ae2893d336fd1b8f64c9f92276391d0f1b4"
+  integrity sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-literals@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae"
-  integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
+"@babel/plugin-transform-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz#9d6af353b5209df72960baf4492722d56f39a205"
+  integrity sha512-x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed"
-  integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
+"@babel/plugin-transform-modules-amd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
+  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
-  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
+"@babel/plugin-transform-modules-commonjs@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
+  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-simple-access" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.0":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz#87f11c44fbfd3657be000d4897e192d9cb535996"
-  integrity sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==
+"@babel/plugin-transform-modules-systemjs@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz#026511b7657d63bf5d4cf2fd4aeb963139914a54"
+  integrity sha512-UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f"
-  integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931"
-  integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
+  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-new-target@^7.17.12":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz#8c228c4a07501dd12c95c5f23d1622131cc23931"
-  integrity sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766"
-  integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
+"@babel/plugin-transform-parameters@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.6.tgz#cbe03d5a4c6385dd756034ac1baa63c04beab8dc"
+  integrity sha512-FjdqgMv37yVl/gwvzkcB+wfjRI8HQmc5EgOG9iGNvUY1ok+TjsoaMP7IqCDZBhkFcM5f3OPVMs6Dmp03C5k4/A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5"
-  integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
+"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f"
-  integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.15.0":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz#f4d3188ba6a8815793993c71c2c225d0ee1d7743"
-  integrity sha512-Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.6.tgz#77b14416015ea93367ca06979710f5000ff34ccb"
+  integrity sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    babel-plugin-polyfill-corejs2 "^0.3.1"
+    babel-plugin-polyfill-corejs3 "^0.5.2"
+    babel-plugin-polyfill-regenerator "^0.3.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5"
-  integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
+"@babel/plugin-transform-spread@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz#82b080241965f1689f0a60ecc6f1f6575dbdb9d6"
+  integrity sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
-  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
+"@babel/plugin-transform-template-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz#b763f4dc9d11a7cce58cf9a490d82e80547db9c2"
+  integrity sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-typeof-symbol@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889"
-  integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
+"@babel/plugin-transform-typeof-symbol@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz#486bb39d5a18047358e0d04dc0d2f322f0b92e92"
+  integrity sha512-7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz#0d01fb7fb2243ae1c033f65f6e3b4be78db75f27"
+  integrity sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@^7.15.0":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a"
-  integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==
-  dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.18.2"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12"
-    "@babel/plugin-proposal-async-generator-functions" "^7.17.12"
-    "@babel/plugin-proposal-class-properties" "^7.17.12"
-    "@babel/plugin-proposal-class-static-block" "^7.18.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.17.12"
-    "@babel/plugin-proposal-json-strings" "^7.17.12"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.17.12"
-    "@babel/plugin-proposal-private-methods" "^7.17.12"
-    "@babel/plugin-proposal-private-property-in-object" "^7.17.12"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.17.12"
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.6.tgz#953422e98a5f66bc56cd0b9074eaea127ec86ace"
+  integrity sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw==
+  dependencies:
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.6"
+    "@babel/plugin-proposal-async-generator-functions" "^7.18.6"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.6"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.6"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.18.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.6"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.17.12"
+    "@babel/plugin-syntax-import-assertions" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -817,43 +819,43 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.17.12"
-    "@babel/plugin-transform-async-to-generator" "^7.17.12"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.17.12"
-    "@babel/plugin-transform-classes" "^7.17.12"
-    "@babel/plugin-transform-computed-properties" "^7.17.12"
-    "@babel/plugin-transform-destructuring" "^7.18.0"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.17.12"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.18.1"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.17.12"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.18.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.2"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.0"
-    "@babel/plugin-transform-modules-umd" "^7.18.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12"
-    "@babel/plugin-transform-new-target" "^7.17.12"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.17.12"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.18.0"
-    "@babel/plugin-transform-reserved-words" "^7.17.12"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.17.12"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.18.2"
-    "@babel/plugin-transform-typeof-symbol" "^7.17.12"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.18.6"
+    "@babel/plugin-transform-classes" "^7.18.6"
+    "@babel/plugin-transform-computed-properties" "^7.18.6"
+    "@babel/plugin-transform-destructuring" "^7.18.6"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.6"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.6"
+    "@babel/plugin-transform-function-name" "^7.18.6"
+    "@babel/plugin-transform-literals" "^7.18.6"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.18.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.18.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.18.6"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.18.6"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.6"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.6"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.6"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.2"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
+    "@babel/types" "^7.18.6"
+    babel-plugin-polyfill-corejs2 "^0.3.1"
+    babel-plugin-polyfill-corejs3 "^0.5.2"
+    babel-plugin-polyfill-regenerator "^0.3.1"
     core-js-compat "^3.22.1"
     semver "^6.3.0"
 
@@ -869,43 +871,43 @@
     esutils "^2.0.2"
 
 "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
-  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz#6a1ef59f838debd670421f8c7f2cbb8da9751580"
+  integrity sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.5":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.5.tgz#94a8195ad9642801837988ab77f36e992d9a20cd"
-  integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.2"
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.18.5"
-    "@babel/types" "^7.18.4"
+"@babel/template@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
+  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.6.tgz#a228562d2f46e89258efa4ddd0416942e2fd671d"
+  integrity sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.18.6"
+    "@babel/types" "^7.18.6"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.18.4", "@babel/types@^7.4.4":
-  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
-  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
+"@babel/types@^7.18.6", "@babel/types@^7.18.7", "@babel/types@^7.4.4":
+  version "7.18.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.7.tgz#a4a2c910c15040ea52cdd1ddb1614a65c8041726"
+  integrity sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
 "@colors/colors@1.5.0":
@@ -973,24 +975,24 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/gen-mapping@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
-  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
   dependencies:
-    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
-  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz#687cc2bbf243f4e9a868ecf2262318e2658873a1"
+  integrity sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w==
 
-"@jridgewell/set-array@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
-  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
 "@jridgewell/source-map@^0.3.2":
   version "0.3.2"
@@ -1001,14 +1003,14 @@
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
-  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
-  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -1145,7 +1147,7 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
-"@types/eslint@^7.28.2":
+"@types/eslint@^7.29.0":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
   integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
@@ -1154,9 +1156,9 @@
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+  version "0.0.52"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.52.tgz#7f1f57ad5b741f3d5b210d3b1f145640d89bf8fe"
+  integrity sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.29"
@@ -1200,9 +1202,9 @@
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
-  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+  version "18.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.1.tgz#e91bd73239b338557a84d1f67f7b9e0f25643870"
+  integrity sha512-CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1699,7 +1701,7 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.3.0:
+babel-plugin-polyfill-corejs2@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
   integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
@@ -1708,7 +1710,7 @@ babel-plugin-polyfill-corejs2@^0.3.0:
     "@babel/helper-define-polyfill-provider" "^0.3.1"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.0:
+babel-plugin-polyfill-corejs3@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
   integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
@@ -1716,7 +1718,7 @@ babel-plugin-polyfill-corejs3@^0.5.0:
     "@babel/helper-define-polyfill-provider" "^0.3.1"
     core-js-compat "^3.21.0"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
+babel-plugin-polyfill-regenerator@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
   integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
@@ -1943,16 +1945,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.20.4, browserslist@^4.6.4:
-  version "4.20.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
-  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.21.0, browserslist@^4.6.4:
+  version "4.21.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00"
+  integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==
   dependencies:
-    caniuse-lite "^1.0.30001349"
-    electron-to-chromium "^1.4.147"
-    escalade "^3.1.1"
+    caniuse-lite "^1.0.30001359"
+    electron-to-chromium "^1.4.172"
     node-releases "^2.0.5"
-    picocolors "^1.0.0"
+    update-browserslist-db "^1.0.4"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2095,10 +2096,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001349:
-  version "1.0.30001357"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz#dec7fc4158ef6ad24690d0eec7b91f32b8cb1b5d"
-  integrity sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001359:
+  version "1.0.30001363"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz#26bec2d606924ba318235944e1193304ea7c4f15"
+  integrity sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
@@ -2354,10 +2355,10 @@ confusing-browser-globals@^1.0.10:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+connect-history-api-fallback@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
+  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
 connect@^3.7.0:
   version "3.7.0"
@@ -2431,17 +2432,17 @@ copy-descriptor@^0.1.0:
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.23.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b"
-  integrity sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==
+  version "3.23.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.3.tgz#7d8503185be76bb6d8d592c291a4457a8e440aa9"
+  integrity sha512-WSzUs2h2vvmKsacLHNTdpyOC9k43AEhcGoFlVgCY4L7aw98oSBKtPL6vD0/TqZjRWRQYdDSLkzZIni4Crbbiqw==
   dependencies:
-    browserslist "^4.20.4"
+    browserslist "^4.21.0"
     semver "7.0.0"
 
 core-js@^3.16.2, core-js@^3.6.5:
-  version "3.23.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
-  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
+  version "3.23.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.3.tgz#3b977612b15da6da0c9cc4aec487e8d24f371112"
+  integrity sha512-oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2954,10 +2955,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.147:
-  version "1.4.161"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz#49cb5b35385bfee6cc439d0a04fbba7a7a7f08a1"
-  integrity sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==
+electron-to-chromium@^1.4.172:
+  version "1.4.177"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.177.tgz#b6a4436eb788ca732556cd69f384b8a3c82118c5"
+  integrity sha512-FYPir3NSBEGexSZUEeht81oVhHfLFl6mhUKSkjHN/iB/TwEIt/WHQrqVGfTLN5gQxwJCQkIJBe05eOXjI7omgg==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -3202,21 +3203,21 @@ eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint-webpack-plugin@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.6.0.tgz#3bd4ada4e539cb1f6687d2f619073dbb509361cd"
-  integrity sha512-V+LPY/T3kur5QO3u+1s34VDTcRxjXWPUGM4hlmTb5DwVD0OQz631yGTxJZf4SpAqAjdbBVe978S8BJeHpAdOhQ==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.7.0.tgz#0525793a4f8c652c1c6d863995ce1e0f2dcbd143"
+  integrity sha512-bNaVVUvU4srexGhVcayn/F4pJAz19CWBkKoMx7aSQ4wtTbZQCnG5O9LHCE42mM+JSKOUp7n6vd5CIwzj7lOVGA==
   dependencies:
-    "@types/eslint" "^7.28.2"
+    "@types/eslint" "^7.29.0"
     arrify "^2.0.1"
-    jest-worker "^27.3.1"
-    micromatch "^4.0.4"
+    jest-worker "^27.5.1"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
     schema-utils "^3.1.1"
 
 eslint@^8.18.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd"
-  integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==
+  version "8.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.19.0.tgz#7342a3cbc4fbc5c106a1eefe0fd0b50b6b1a7d28"
+  integrity sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==
   dependencies:
     "@eslint/eslintrc" "^1.3.0"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -3575,9 +3576,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0, flatted@^3.2.2, flatted@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
+  integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -3992,9 +3993,9 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd"
-  integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
 http-proxy-middleware@^2.0.3:
   version "2.0.6"
@@ -4505,7 +4506,7 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.3.1:
+jest-worker@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
@@ -4906,9 +4907,9 @@ media-typer@0.3.0:
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 memfs@^3.4.3:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.6.tgz#74097983d27c82b973665885dc75f27a65174510"
-  integrity sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a"
+  integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==
   dependencies:
     fs-monkey "^1.0.3"
 
@@ -4962,7 +4963,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5059,9 +5060,9 @@ minipass-pipeline@^1.2.2:
     minipass "^3.0.0"
 
 minipass@^3.0.0, minipass@^3.1.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d"
-  integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
+  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
@@ -6577,10 +6578,10 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+regexpu-core@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
+  integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
   dependencies:
     regenerate "^1.4.2"
     regenerate-unicode-properties "^10.0.1"
@@ -6763,9 +6764,9 @@ sass-loader@10.1.1:
     semver "^7.3.2"
 
 sass@^1.38.0:
-  version "1.52.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
-  integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
+  integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -7029,9 +7030,9 @@ socket.io-adapter@~2.4.0:
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
 socket.io-parser@~4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
-  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
+  integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
   dependencies:
     "@types/component-emitter" "^1.2.10"
     component-emitter "~1.3.0"
@@ -7690,6 +7691,14 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz#dbfc5a789caa26b1db8990796c2c8ebbce304824"
+  integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -7862,9 +7871,9 @@ webpack-dev-middleware@^5.3.1:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz#c188db28c7bff12f87deda2a5595679ebbc3c9bc"
-  integrity sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz#2360a5d6d532acb5410a668417ad549ee3b8a3c9"
+  integrity sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -7878,7 +7887,7 @@ webpack-dev-server@^4.7.3:
     chokidar "^3.5.3"
     colorette "^2.0.10"
     compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
+    connect-history-api-fallback "^2.0.0"
     default-gateway "^6.0.3"
     express "^4.17.3"
     graceful-fs "^4.2.6"

From 685cd920696ded2a5fe554168bee87b81b79cd66 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 5 Jul 2022 16:28:16 -0700
Subject: [PATCH 73/95] added some config setting for babel to deal with
 warning messages when compiling assets

---
 babel.config.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/babel.config.js b/babel.config.js
index 12f98da5af..61a89d08ea 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -41,12 +41,24 @@ module.exports = function(api) {
       '@babel/plugin-syntax-dynamic-import',
       isTestEnv && 'babel-plugin-dynamic-import-node',
       '@babel/plugin-transform-destructuring',
+      [
+        '@babel/plugin-proposal-private-methods',
+        {
+          loose: true
+        }
+      ],
       [
         '@babel/plugin-proposal-class-properties',
         {
           loose: true
         }
       ],
+      [
+        '@babel/plugin-proposal-private-property-in-object',
+        {
+          loose: true
+        }
+      ],
       [
         '@babel/plugin-proposal-object-rest-spread',
         {

From 139d45ffb2bb5a5f4c71e187e21be6c1133b9b1d Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Fri, 8 Jul 2022 15:18:48 -0700
Subject: [PATCH 74/95] updated rubocop rule

---
 .rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ed01688efc..4724d83f18 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -45,7 +45,7 @@ AllCops:
 # -----------
 # - GEMSPEC -
 # -----------
-Gemspec/DateAssignment: # new in 1.10
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
 # ----------

From 9765df066c2b7b1141f05ac351d52c9d2ae0a119 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Fri, 8 Jul 2022 15:26:58 -0700
Subject: [PATCH 75/95] make rubocop happy

---
 app/helpers/feedbacks_helper.rb                  | 4 ++--
 lib/cleanup/deprecators/get_deprecator.rb        | 4 ++--
 lib/cleanup/deprecators/predicate_deprecator.rb  | 4 ++--
 lib/cleanup/deprecators/set_deprecator.rb        | 4 ++--
 spec/services/external_apis/base_service_spec.rb | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/helpers/feedbacks_helper.rb b/app/helpers/feedbacks_helper.rb
index 5ebf022655..2b70df69a8 100644
--- a/app/helpers/feedbacks_helper.rb
+++ b/app/helpers/feedbacks_helper.rb
@@ -7,9 +7,9 @@ def feedback_confirmation_default_subject
   end
 
   def feedback_confirmation_default_message
-    _('<p>Hello %{user_name}.</p>'\
+    _('<p>Hello %{user_name}.</p>' \
       "<p>Your plan \"%{plan_name}\" has been submitted for feedback from an
-      administrator at your organisation. "\
+      administrator at your organisation. " \
       "If you have questions pertaining to this action, please contact us
       at %{organisation_email}.</p>")
   end
diff --git a/lib/cleanup/deprecators/get_deprecator.rb b/lib/cleanup/deprecators/get_deprecator.rb
index f8e45aaa7e..673ce28590 100644
--- a/lib/cleanup/deprecators/get_deprecator.rb
+++ b/lib/cleanup/deprecators/get_deprecator.rb
@@ -11,8 +11,8 @@ module Deprecators
     class GetDeprecator
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = '%{deprecated_method} is deprecated. '\
-                'Instead, you should use: %{new_method}. '\
+      MESSAGE = '%{deprecated_method} is deprecated. ' \
+                'Instead, you should use: %{new_method}. ' \
                 "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
diff --git a/lib/cleanup/deprecators/predicate_deprecator.rb b/lib/cleanup/deprecators/predicate_deprecator.rb
index a9d282a362..ee774fc559 100644
--- a/lib/cleanup/deprecators/predicate_deprecator.rb
+++ b/lib/cleanup/deprecators/predicate_deprecator.rb
@@ -10,8 +10,8 @@ module Deprecators
     class PredicateDeprecator
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = '%{deprecated_method} is deprecated. '\
-                'Instead, you should use: %{new_method}. '\
+      MESSAGE = '%{deprecated_method} is deprecated. ' \
+                'Instead, you should use: %{new_method}. ' \
                 "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
diff --git a/lib/cleanup/deprecators/set_deprecator.rb b/lib/cleanup/deprecators/set_deprecator.rb
index 91a29d12e7..28554e311e 100644
--- a/lib/cleanup/deprecators/set_deprecator.rb
+++ b/lib/cleanup/deprecators/set_deprecator.rb
@@ -11,8 +11,8 @@ module Deprecators
     class SetDeprecator
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = '%{deprecated_method} is deprecated. '\
-                'Instead, you should use: %{new_method}. '\
+      MESSAGE = '%{deprecated_method} is deprecated. ' \
+                'Instead, you should use: %{new_method}. ' \
                 "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
diff --git a/spec/services/external_apis/base_service_spec.rb b/spec/services/external_apis/base_service_spec.rb
index 2d371f9c41..3823cf0c23 100644
--- a/spec/services/external_apis/base_service_spec.rb
+++ b/spec/services/external_apis/base_service_spec.rb
@@ -21,8 +21,8 @@
       expect(@headers[:Accept]).to eql('application/json')
     end
     it 'sets the User-Agent header for the default Application name and contact us url' do
-      expected = "#{described_class.send(:app_name)}" \
-                 " (#{described_class.send(:app_email)})"
+      expected = "#{described_class.send(:app_name)} " \
+                 "(#{described_class.send(:app_email)})"
       expect(@headers[:'User-Agent']).to eql(expected)
     end
   end

From 7315c5e6062f84876a5fb85bb5bd05610856eb82 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Thu, 14 Jul 2022 11:14:50 -0700
Subject: [PATCH 76/95] testing codepipeline

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 748dd47aa6..33aba7b936 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 DMP Roadmap is a Data Management Planning tool. Management and development of DMP Roadmap is jointly provided by the Digital Curation Centre (DCC), http://www.dcc.ac.uk/, and the University of California Curation Center (UC3), http://www.cdlib.org/services/uc3/.
 
-The tool has four main functions:
+The tool has four main Functions:
 
 1. To help create and maintain different versions of Data Management Plans;
 2. To provide useful guidance on data management issues and how to meet research funders' requirements;

From ed51d44b122ad2075a2962d0b0c2e0d40c4faadd Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 19 Jul 2022 09:27:52 -0700
Subject: [PATCH 77/95] change to REAME for codepipeline demo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33aba7b936..748dd47aa6 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 DMP Roadmap is a Data Management Planning tool. Management and development of DMP Roadmap is jointly provided by the Digital Curation Centre (DCC), http://www.dcc.ac.uk/, and the University of California Curation Center (UC3), http://www.cdlib.org/services/uc3/.
 
-The tool has four main Functions:
+The tool has four main functions:
 
 1. To help create and maintain different versions of Data Management Plans;
 2. To provide useful guidance on data management issues and how to meet research funders' requirements;

From bb4003e0a03409bf04b93a9645ee19bd2bbd069f Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 08:07:38 -0700
Subject: [PATCH 78/95] update to prevent users from being able to make all of
 their guidance groups optional subsets

---
 app/controllers/guidance_groups_controller.rb     |  4 +++-
 .../guidance_groups/_guidance_group_form.html.erb | 15 ++++++++++-----
 app/views/guidance_groups/admin_edit.html.erb     |  8 +++++++-
 app/views/guidance_groups/admin_new.html.erb      |  7 ++++++-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
index 611d5ef4d4..4b581efb35 100644
--- a/app/controllers/guidance_groups_controller.rb
+++ b/app/controllers/guidance_groups_controller.rb
@@ -13,6 +13,7 @@ class GuidanceGroupsController < ApplicationController
 
   # GET /org/admin/guidancegroup/:id/admin_new
   def admin_new
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
     @guidance_group = GuidanceGroup.new(org_id: current_user.org.id)
     authorize @guidance_group
   end
@@ -37,7 +38,8 @@ def admin_create
 
   # GET /org/admin/guidancegroup/:id/admin_edit
   def admin_edit
-    @guidance_group = GuidanceGroup.find(params[:id])
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
+    @guidance_group = @guidance_groups.select { |gg| gg.id == params[:id] }
     authorize @guidance_group
   end
 
diff --git a/app/views/guidance_groups/_guidance_group_form.html.erb b/app/views/guidance_groups/_guidance_group_form.html.erb
index 9b192bab28..a0384f0095 100644
--- a/app/views/guidance_groups/_guidance_group_form.html.erb
+++ b/app/views/guidance_groups/_guidance_group_form.html.erb
@@ -1,4 +1,4 @@
-<%# locals: form %>
+<%# locals: form, allow_subset_flag %>
 <%
 name_tip = _('Add an appropriate name for your guidance group. This name will tell the end user where the guidance has come from. We suggest you use the organisation or department name e.g. "OU" or "Maths & Stats"')
 published_tip = _("Check this box when you are ready for guidance associated with this group to appear on user's plans.")
@@ -14,10 +14,15 @@ subset_tip = _("If the guidance is only meant for a subset of users e.g. those i
   <%= form.check_box :published, data: { toggle: 'tooltip' }, title: published_tip %>
   <%= form.label :published, class: "control-label" %>
 </div>
-<div class='form-input col-xs-8'>
-  <%= form.check_box :optional_subset, data: { toggle: 'tooltip' }, title: subset_tip %>
-  <%= form.label :optional_subset, class: "control-label" %><%= _(' (e.g. School/ Department) ') %>
-</div>
+<%# Only display the optional subset flag if allowed. Otherwise default to 'false' %>
+<% if allow_subset_flag %>
+  <div class='form-input col-xs-8'>
+    <%= form.check_box :optional_subset, data: { toggle: 'tooltip' }, title: subset_tip %>
+    <%= form.label :optional_subset, class: "control-label" %><%= _(' (e.g. School/ Department) ') %>
+  </div>
+<% else %>
+  <%= form.hidden_field :optional_subset, value: "0" %>
+<% end %>
 <div class="form-group col-xs-8">
   <%= form.hidden_field :org_id %>
   <%= form.submit _('Save'), class: "btn btn-primary" %>
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index cbd3728464..23c62daa82 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -11,7 +11,13 @@
   <div class="col-md-12">
     <%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group),
                                   html: { method: :put, id: "admin_update_guidance_group_form" }) do |f| %>
-      <%= render partial: "guidance_groups/guidance_group_form", locals: { form: f } %>
+      <%= render partial: "guidance_groups/guidance_group_form",
+                 locals: {
+                   form: f,
+                   # Don't display the optional subset if there are no GuidanceGroups that are
+                   # not an optional subset
+                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? }.any?
+                 } %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index be2be02205..1f99bb0a19 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -11,7 +11,12 @@
   <div class="col-md-12">
     <%= form_for :guidance_group, url: { action: "admin_create" },
                                   html: { id: 'admin_create_guidance_group_form' } do |f| %>
-      <%= render partial: "guidance_groups/guidance_group_form", locals: { form: f } %>
+      <%= render partial: "guidance_groups/guidance_group_form",
+                 locals: {
+                   form: f,
+                   # Don't display the optional subset if there is only one GuidanceGroup
+                   allow_subset_flag: @guidance_groups.length > 1
+                 } %>
     <% end %>
   </div>
 </div>

From d1676d87dcd9916a29a3825d77fd1a32e1687973 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 09:18:13 -0700
Subject: [PATCH 79/95] updates to prevent deletion of only non-optional subset

---
 app/controllers/guidance_groups_controller.rb       | 2 +-
 app/views/paginable/guidance_groups/_index.html.erb | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
index 4b581efb35..67b0038097 100644
--- a/app/controllers/guidance_groups_controller.rb
+++ b/app/controllers/guidance_groups_controller.rb
@@ -39,7 +39,7 @@ def admin_create
   # GET /org/admin/guidancegroup/:id/admin_edit
   def admin_edit
     @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
-    @guidance_group = @guidance_groups.select { |gg| gg.id == params[:id] }
+    @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group
   end
 
diff --git a/app/views/paginable/guidance_groups/_index.html.erb b/app/views/paginable/guidance_groups/_index.html.erb
index fe87c3148a..c1a99d1f4b 100644
--- a/app/views/paginable/guidance_groups/_index.html.erb
+++ b/app/views/paginable/guidance_groups/_index.html.erb
@@ -12,6 +12,11 @@
     </thead>
     <tbody>
       <% scope.each do |guidance_gr| %>
+        <%# Don't allow the only non-optional_subset guidance group to be deleted! %>
+        <%
+        allow_delete = guidance_gr.optional_subset?
+        allow_delete = scope.reject { |gg| gg.optional_subset? }.length > 1 unless allow_delete
+        %>
         <tr>
           <td><%= guidance_gr.name %></td>
           <td class="text-center">
@@ -47,7 +52,9 @@
                 <% else %>
                     <li><%= link_to _('Publish'),  admin_update_publish_guidance_group_path(guidance_gr), method: :put %></li>
                 <% end %>
-                <li><%= link_to _('Remove'), admin_destroy_guidance_group_path(guidance_gr), data: {confirm: _("You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?") % { :guidance_group_name => guidance_gr.name }}, method: :delete %></li>
+                <% if allow_delete %>
+                  <li><%= link_to _('Remove'), admin_destroy_guidance_group_path(guidance_gr), data: {confirm: _("You are about to delete '%{guidance_group_name}'. This will affect guidance. Are you sure?") % { :guidance_group_name => guidance_gr.name }}, method: :delete %></li>
+                <% end %>
               </ul>
             </div>
           </td>

From edebfc831f33a55f08e6ef2ddcf56a251ccf5a2c Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 09:54:34 -0700
Subject: [PATCH 80/95] tweak to logic when editing guidance_group

---
 app/views/guidance_groups/admin_edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 23c62daa82..6e5ad98c50 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -16,7 +16,7 @@
                    form: f,
                    # Don't display the optional subset if there are no GuidanceGroups that are
                    # not an optional subset
-                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? }.any?
+                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? } > 1
                  } %>
     <% end %>
   </div>

From 2a109b3c03e282a5f6518b692373931f137c4aa2 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 11:39:56 -0700
Subject: [PATCH 81/95] tweak to logic when editing guidance_group

---
 app/views/guidance_groups/admin_edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 6e5ad98c50..ff4e781c28 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -16,7 +16,7 @@
                    form: f,
                    # Don't display the optional subset if there are no GuidanceGroups that are
                    # not an optional subset
-                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? } > 1
+                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? }.length > 1
                  } %>
     <% end %>
   </div>

From 7acc2980b3ca4b943cf98561f27d12da411fa226 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 13:44:11 -0700
Subject: [PATCH 82/95] tweak to logic when editing guidance_group

---
 app/views/guidance_groups/admin_edit.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index ff4e781c28..516eb566f4 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -11,12 +11,16 @@
   <div class="col-md-12">
     <%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group),
                                   html: { method: :put, id: "admin_update_guidance_group_form" }) do |f| %>
+      <%
+      allow_subset = @guidance_group.optional_subset?
+      allow_subset = @guidance_groups.reject { |gg| gg.optional_subset? }.length > 1 unless allow_subset
+      %>
       <%= render partial: "guidance_groups/guidance_group_form",
                  locals: {
                    form: f,
                    # Don't display the optional subset if there are no GuidanceGroups that are
                    # not an optional subset
-                   allow_subset_flag: @guidance_groups.reject { |gg| gg.optional_subset? }.length > 1
+                   allow_subset_flag:
                  } %>
     <% end %>
   </div>

From efc89a2c64892f2332c75b51330f80a0a3793ac0 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 14:54:38 -0700
Subject: [PATCH 83/95] tweak to logic when editing guidance_group

---
 app/views/guidance_groups/admin_edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 516eb566f4..6a1413d984 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -20,7 +20,7 @@
                    form: f,
                    # Don't display the optional subset if there are no GuidanceGroups that are
                    # not an optional subset
-                   allow_subset_flag:
+                   allow_subset_flag: allow_subset
                  } %>
     <% end %>
   </div>

From bbf34d08d309fc54041b8c5de5dd4a92fb9195fa Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 15 Aug 2022 15:25:53 -0700
Subject: [PATCH 84/95] added @guidance_groups to update and create so they are
 available during view render

---
 app/controllers/guidance_groups_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
index 67b0038097..9871a4d886 100644
--- a/app/controllers/guidance_groups_controller.rb
+++ b/app/controllers/guidance_groups_controller.rb
@@ -23,6 +23,7 @@ def admin_new
   def admin_create
     # Ensure that the user can only create GuidanceGroups for their Org
     args = guidance_group_params.to_h.merge({ org_id: current_user.org.id })
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
     @guidance_group = GuidanceGroup.new(args)
     authorize @guidance_group
 
@@ -46,6 +47,7 @@ def admin_edit
   # PUT /org/admin/guidancegroup/:id/admin_update
   # rubocop:disable Metrics/AbcSize
   def admin_update
+    @guidance_groups = GuidanceGroup.where(org_id: current_user.org.id)
     @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group
 

From 04e2aca2fbef746b6bcabd742dd6555ec8c62353 Mon Sep 17 00:00:00 2001
From: Nicolas Franck <nicolas.franck@ugent.be>
Date: Tue, 30 Aug 2022 10:33:25 +0200
Subject: [PATCH 85/95] pluck with ampersand returns not id

---
 app/policies/api/v1/plans_policy.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/policies/api/v1/plans_policy.rb b/app/policies/api/v1/plans_policy.rb
index 005bf9a2c0..96d1cfc4b5 100644
--- a/app/policies/api/v1/plans_policy.rb
+++ b/app/policies/api/v1/plans_policy.rb
@@ -25,8 +25,8 @@ def resolve
         def plans_for_client
           return [] unless @user.present?
 
-          ids = @user.plans.pluck(&:id)
-          ids += @user.org.plans.pluck(&:id) if @user.org.present?
+          ids = @user.plans.pluck(:id)
+          ids += @user.org.plans.pluck(:id) if @user.org.present?
           ids.uniq
         end
 

From 273ce4fd85363a9286ff2b628f19570d5b1acb93 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 26 Sep 2022 11:20:35 -0700
Subject: [PATCH 86/95] updated Identifier model to strip whitespace before
 appending IdeentifierScheme prefix

---
 app/models/identifier.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/identifier.rb b/app/models/identifier.rb
index 0ee44592b1..c68834cb95 100644
--- a/app/models/identifier.rb
+++ b/app/models/identifier.rb
@@ -77,7 +77,7 @@ def value=(val)
 
       base = identifier_scheme.identifier_prefix
       base += '/' unless base.ends_with?('/')
-      super("#{base}#{val}")
+      super("#{base}#{val.strip}")
     else
       super(val)
     end

From 22ab9d4c1b3632e92bf5f5e721c1c2c6ffddb335 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 28 Sep 2022 09:11:12 -0700
Subject: [PATCH 87/95] updated fix to first convert the value to string before
 trying to strip whitespace

---
 app/models/identifier.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/identifier.rb b/app/models/identifier.rb
index c68834cb95..8d8a6221ca 100644
--- a/app/models/identifier.rb
+++ b/app/models/identifier.rb
@@ -77,7 +77,7 @@ def value=(val)
 
       base = identifier_scheme.identifier_prefix
       base += '/' unless base.ends_with?('/')
-      super("#{base}#{val.strip}")
+      super("#{base}#{val.to_s.strip}")
     else
       super(val)
     end

From f0f03c060ecd8683f4d9d1452c0383ade468c1aa Mon Sep 17 00:00:00 2001
From: gjacob24 <gjacob@ed.ac.uk>
Date: Mon, 3 Oct 2022 15:17:13 +0100
Subject: [PATCH 88/95] Fix for issue #3217 regarding template search feature

---
 app/models/template.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/models/template.rb b/app/models/template.rb
index eaac5f2950..956852d821 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -206,12 +206,16 @@ class Template < ApplicationRecord
   }
 
   # Retrieves unarchived templates whose title or org.name includes the term
-  # passed
+  # passed(We use search_term_orgs as alias for orgs to avoid issues with
+  # any orgs table join already present in loaded unarchived.)
   scope :search, lambda { |term|
-    unarchived.joins(:org)
-              .where('lower(templates.title) LIKE lower(:term) OR ' \
-                     'lower(orgs.name) LIKE lower(:term)',
-                     term: "%#{term}%")
+    unarchived
+      .joins(<<~SQL)
+        JOIN orgs AS search_term_orgs ON search_term_orgs.id = templates.org_id
+      SQL
+      .where('lower(templates.title) LIKE lower(:term)' \
+             'OR lower(search_term_orgs.name) LIKE lower(:term)',
+             term: "%#{term}%")
   }
 
   # defines the export setting for a template object

From 4b2fe7e5e1f51386aa75d7e4146c2e8a144aa5ab Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 24 Oct 2022 17:08:55 +0200
Subject: [PATCH 89/95] Fixed issue with Plan & Template visibilities

---
 app/models/plan.rb     | 2 --
 app/models/template.rb | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/app/models/plan.rb b/app/models/plan.rb
index 7fbfce102a..0cf221887b 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -75,8 +75,6 @@ class Plan < ApplicationRecord
 
   alias_attribute :name, :title
 
-  attribute :visibility, :integer, default: 3
-
   # ================
   # = Associations =
   # ================
diff --git a/app/models/template.rb b/app/models/template.rb
index eaac5f2950..2ca470ab02 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -62,10 +62,6 @@ class Template < ApplicationRecord
   attribute :customization_of, :integer, default: nil
   attribute :family_id, :integer, default: -> { Template.new_family_id }
 
-  # TODO: re-add visibility setting? (this is handled in org_admin/create and
-  # relies on the org_id in the current callback-form)
-  attribute :visibility, :integer, default: 0
-
   # ================
   # = Associations =
   # ================

From 426cde5582a00da39ebbfc5bfead8e6b6133e743 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 24 Oct 2022 17:11:32 +0200
Subject: [PATCH 90/95] Update gems & js packages

---
 Gemfile.lock |  232 ++++++------
 yarn.lock    | 1019 ++++++++++++++++++++++++--------------------------
 2 files changed, 606 insertions(+), 645 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f44a1d3936..575e507936 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,70 +1,70 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actioncable (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailbox (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailer (6.1.7)
+      actionpack (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actiontext (6.1.7)
+      actionpack (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       nokogiri (>= 1.8.5)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activejob (6.1.7)
+      activesupport (= 6.1.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activerecord (6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activemodel (6.1.7)
+      activesupport (= 6.1.7)
+    activerecord (6.1.7)
+      activemodel (= 6.1.7)
+      activesupport (= 6.1.7)
     activerecord_json_validator (2.1.1)
       activerecord (>= 4.2.0, < 8)
       json_schemer (~> 0.2.18)
-    activestorage (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activestorage (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activesupport (= 6.1.7)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.6.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -104,8 +104,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-webmock (0.1.0)
-    childprocess (4.1.0)
+    capybara-webmock (0.6.0)
+      capybara (>= 2.4, < 4)
+      rack (>= 1.4)
+      rack-proxy (>= 0.6.0)
+      rexml (>= 3.2)
+      selenium-webdriver (~> 3.0)
+      webrick (>= 1.7)
+    childprocess (3.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     contact_us (1.2.0)
@@ -144,22 +150,22 @@ GEM
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     erubi (1.11.0)
-    excon (0.92.4)
+    excon (0.93.1)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.22.0)
+    faker (2.23.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.5.2)
+    faraday (2.6.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.1)
     ffi (1.15.5)
     flag_shih_tzu (0.3.23)
-    fog-aws (3.14.0)
+    fog-aws (3.15.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -219,7 +225,7 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    jwt (2.4.1)
+    jwt (2.5.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -238,7 +244,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -254,27 +260,25 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
-    mocha (1.14.0)
-    msgpack (1.5.4)
+    minitest (5.16.3)
+    mocha (1.16.0)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mysql2 (0.5.4)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (2.0.6)
+    oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-      rash_alt (>= 0.4, < 1)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
       version_gem (~> 1.1)
     omniauth (2.1.0)
       hashie (>= 3.4.6)
@@ -296,7 +300,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.4.3)
+    pg (1.4.4)
     prime (0.1.2)
       forwardable
       singleton
@@ -306,8 +310,8 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
-    puma (5.6.4)
+    public_suffix (5.0.0)
+    puma (6.0.0)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -317,26 +321,26 @@ GEM
     rack (2.2.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-protection (2.2.2)
+    rack-protection (3.0.2)
       rack
-    rack-proxy (0.7.2)
+    rack-proxy (0.7.4)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (6.1.6.1)
-      actioncable (= 6.1.6.1)
-      actionmailbox (= 6.1.6.1)
-      actionmailer (= 6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actiontext (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    rails (6.1.7)
+      actioncable (= 6.1.7)
+      actionmailbox (= 6.1.7)
+      actionmailer (= 6.1.7)
+      actionpack (= 6.1.7)
+      actiontext (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activemodel (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.6.1)
+      railties (= 6.1.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -347,57 +351,55 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rash_alt (0.4.12)
-      hashie (>= 3.4)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    recaptcha (5.10.0)
+    recaptcha (5.12.3)
       json
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rollbar (3.3.1)
+    rollbar (3.3.2)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.11.0)
-    rubocop (1.35.0)
+    rspec-rails (6.0.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
+    rspec-support (3.11.1)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
@@ -415,11 +417,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.4.0)
-      childprocess (>= 0.5, < 5.0)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     shellany (0.0.1)
     shoulda (4.0.0)
@@ -429,12 +429,15 @@ GEM
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     singleton (0.1.1)
-    spring (2.1.1)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    spring (4.1.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-watcher-listen (2.0.1)
+    spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
+      spring (>= 4)
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -448,16 +451,16 @@ GEM
     tomparse (0.4.2)
     translation (1.32)
       gettext (~> 3.2, >= 3.2.5, <= 3.4.3)
-    turbo-rails (1.1.1)
+    turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
     uniform_notifier (1.16.0)
     uri_template (0.7.0)
-    version_gem (1.1.0)
+    version_gem (1.1.1)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -465,11 +468,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
-    webmock (3.17.1)
+      selenium-webdriver (> 3.141, < 5.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -479,7 +482,6 @@ GEM
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     webrick (1.7.0)
-    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -493,10 +495,10 @@ GEM
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   activerecord_json_validator
@@ -578,4 +580,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.20
+   2.3.15
diff --git a/yarn.lock b/yarn.lock
index e269a86213..14cf9c7d1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,38 +17,38 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.19.3", "@babel/compat-data@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747"
+  integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==
 
 "@babel/core@^7.11.6", "@babel/core@^7.15.0":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
-  integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
+  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.10"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.10"
+    "@babel/generator" "^7.19.6"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helpers" "^7.19.4"
+    "@babel/parser" "^7.19.6"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.10"
-    "@babel/types" "^7.18.10"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.10":
-  version "7.18.12"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
-  integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==
+"@babel/generator@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d"
+  integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==
   dependencies:
-    "@babel/types" "^7.18.10"
+    "@babel/types" "^7.19.4"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -67,41 +67,41 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca"
+  integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
+    "@babel/compat-data" "^7.19.3"
     "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce"
-  integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
+  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-member-expression-to-functions" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
-  integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -122,13 +122,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
 
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
@@ -151,19 +151,19 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
+  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-simple-access" "^7.19.4"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -172,10 +172,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
-  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
 
 "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
@@ -188,22 +188,22 @@
     "@babel/types" "^7.18.9"
 
 "@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
-  integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-member-expression-to-functions" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-simple-access@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
+  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.19.4"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
   version "7.18.9"
@@ -219,15 +219,15 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
@@ -235,23 +235,23 @@
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
 "@babel/helper-wrap-function@^7.18.9":
-  version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
-  integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
+  integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
   dependencies:
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.11"
-    "@babel/types" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
 
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helpers@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5"
+  integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.4"
+    "@babel/types" "^7.19.4"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -262,10 +262,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.11":
-  version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
-  integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==
+"@babel/parser@^7.18.10", "@babel/parser@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8"
+  integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -283,13 +283,13 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
-  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7"
+  integrity sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
@@ -358,14 +358,14 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
-  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz#a8fc86e8180ff57290c91a75d83fe658189b642d"
+  integrity sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.19.4"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.18.8"
 
@@ -540,23 +540,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
-  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
+"@babel/plugin-transform-block-scoping@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz#315d70f68ce64426db379a3d830e7ac30be02e9b"
+  integrity sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
-  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
+"@babel/plugin-transform-classes@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
+  integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.19.0"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
@@ -568,12 +569,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292"
-  integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz#46890722687b9b89e1369ad0bd8dc6c5a3b4319d"
+  integrity sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.18.6"
@@ -629,34 +630,31 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
-  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-modules-commonjs@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
-  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
-  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.19.0":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
@@ -666,13 +664,13 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
-  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
+  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
@@ -719,15 +717,15 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.15.0":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
-  integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
@@ -737,12 +735,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
@@ -782,17 +780,17 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@^7.15.0":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
-  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.4.tgz#4c91ce2e1f994f717efb4237891c3ad2d808c94b"
+  integrity sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.19.4"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
+    "@babel/plugin-proposal-async-generator-functions" "^7.19.1"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -801,7 +799,7 @@
     "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
     "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
+    "@babel/plugin-proposal-object-rest-spread" "^7.19.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
     "@babel/plugin-proposal-private-methods" "^7.18.6"
@@ -825,10 +823,10 @@
     "@babel/plugin-transform-arrow-functions" "^7.18.6"
     "@babel/plugin-transform-async-to-generator" "^7.18.6"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
+    "@babel/plugin-transform-block-scoping" "^7.19.4"
+    "@babel/plugin-transform-classes" "^7.19.0"
     "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.19.4"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -838,9 +836,9 @@
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
     "@babel/plugin-transform-modules-amd" "^7.18.6"
     "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.0"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
     "@babel/plugin-transform-new-target" "^7.18.6"
     "@babel/plugin-transform-object-super" "^7.18.6"
     "@babel/plugin-transform-parameters" "^7.18.8"
@@ -848,18 +846,18 @@
     "@babel/plugin-transform-regenerator" "^7.18.6"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
+    "@babel/plugin-transform-spread" "^7.19.0"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
     "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.10"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    core-js-compat "^3.22.1"
+    "@babel/types" "^7.19.4"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -874,13 +872,13 @@
     esutils "^2.0.2"
 
 "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
-  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78"
+  integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.18.10", "@babel/template@^7.18.6":
+"@babel/template@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -889,29 +887,29 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9":
-  version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
-  integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc"
+  integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.10"
+    "@babel/generator" "^7.19.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.11"
-    "@babel/types" "^7.18.10"
+    "@babel/parser" "^7.19.6"
+    "@babel/types" "^7.19.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.4.4":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
-  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.4.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7"
+  integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==
   dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
 "@colors/colors@1.5.0":
@@ -924,14 +922,14 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
+    espree "^9.4.0"
     globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -945,31 +943,31 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@hotwired/turbo-rails@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.3.tgz#a4e04ecb800a06e7f9aa6e298170fa4580b74216"
-  integrity sha512-6qKgn75bMWKx0bJgmSfrdC73EJkGLoSWZPAssvcd3nE7ZpDZff6f67j5OQNjjpRgNB7OFruom6VWguGQGu1fQg==
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.2.4.tgz#d155533e79c4ebdac23e8fe12697d821d5c06307"
+  integrity sha512-givDUQqaccd19BvErz1Cf2j6MXF74m0G6I75oqFJGeXAa7vwkz9nDplefVNrALCR9Xi9j9gy32xmSI6wD0tZyA==
   dependencies:
-    "@hotwired/turbo" "^7.1.0"
+    "@hotwired/turbo" "^7.2.4"
     "@rails/actioncable" "^7.0"
 
-"@hotwired/turbo@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7"
-  integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA==
+"@hotwired/turbo@^7.2.4":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.4.tgz#0d35541be32cfae3b4f78c6ab9138f5b21f28a21"
+  integrity sha512-c3xlOroHp/cCZHDOuLp6uzQYEbvXBUVaal0puXoGJ9M8L/KHwZ3hQozD4dVeSN9msHWLxxtmPT1TlCN7gFhj4w==
 
-"@humanwhocodes/config-array@^0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
-  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b"
+  integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -993,7 +991,7 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
+"@jridgewell/resolve-uri@3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
@@ -1011,18 +1009,18 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
-  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
@@ -1037,12 +1035,12 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1067,26 +1065,26 @@
     rimraf "^3.0.2"
 
 "@rails/actioncable@^6.0.3-1":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.6.tgz#ed0e926112fd476c3ac3c52bd18d39d84624cd62"
-  integrity sha512-gD8zYT8u8AA4wulIW7BN4x6tPSR1Ldt7jXDs3ntBKdgtvqiohBJFEKn8YJSDr7vrCpM/hYuEJxYl/4oJvvENfA==
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.7.tgz#8b4506925d3f7146a70941e4db7ce9dda99f99ae"
+  integrity sha512-F6S74NGpxhbbDRFsQFGYqefRfZPgYvePNtz9hHKYOqLturrsqrDoG+UcrxEGHsvqDUorMYfx4Wl3K8smmk/u2g==
 
 "@rails/actioncable@^7.0":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b"
-  integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41"
+  integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ==
 
 "@rails/activestorage@^6.0.3-1":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.6.tgz#d4ffd5327af8e85dee9f9a4867a7cd64d644e26f"
-  integrity sha512-0ajoVtZK5fNbHqAzKWZR+ocDwnd+D36gG9om3CphSL2QevB7e1YIVZo5UFPbB+3KD0kj8KuW6VaaOOT98Qm5bA==
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.7.tgz#5aaae9f4d10800fdb4fd6fe26fd8b4218579c6e3"
+  integrity sha512-h++k8LBLns4O8AqzdaFp1TsCLP9VSc2hgWI37bjzJ+4D995X7Rd8kdkRmXRaNAUlHDJgy6RpnbhBJ5oiIgWTDw==
   dependencies:
     spark-md5 "^3.0.0"
 
 "@rails/ujs@^6.0.3-1":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.6.tgz#de486ae0a663e1bed637a012cbb2739bfcfa2031"
-  integrity sha512-2M4zlthYmOC6X/tcPcFd//sIL26a7JbCpGNl8uIrQf+pR1Z47uhYt9cOwVqJTJZPurdy2k+YY3Pn64pqruAPEA==
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6"
+  integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w==
 
 "@rails/webpacker@5.4.3":
   version "5.4.3"
@@ -1132,6 +1130,11 @@
     webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
+"@socket.io/component-emitter@~3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
+  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1147,11 +1150,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/component-emitter@^1.2.10":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
-  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
-
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
@@ -1191,18 +1189,18 @@
   integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
-  version "4.17.30"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04"
-  integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==
+  version "4.17.31"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
+  integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@*", "@types/express@^4.17.13":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
-  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
+  integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.18"
@@ -1232,9 +1230,9 @@
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.7.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.4.tgz#95baa50846ae112a7376869d49fec23b2506c69d"
-  integrity sha512-RzRcw8c0B8LzryWOR4Wj7YOTFXvdYKwvrb6xQQyuDfnlTxwYXGCV5RZ/TEbq5L5kn+w3rliHAUyRcG1RtbmTFg==
+  version "18.11.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.4.tgz#7017a52e18dfaad32f55eebd539993014441949c"
+  integrity sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1464,9 +1462,9 @@ acorn@^6.4.1:
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
 acorn@^8.5.0, acorn@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -1628,11 +1626,6 @@ array-includes@^3.1.4:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1736,29 +1729,29 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -1830,10 +1823,10 @@ bn.js@^5.0.0, bn.js@^5.1.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@1.20.0, body-parser@^1.19.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
-  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
+body-parser@1.20.1, body-parser@^1.19.0:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.4"
@@ -1843,15 +1836,15 @@ body-parser@1.20.0, body-parser@^1.19.0:
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.10.3"
+    qs "6.11.0"
     raw-body "2.5.1"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
 bonjour-service@^1.0.11:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz#4ac003dc1626023252d58adf2946f57e5da450c1"
-  integrity sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7"
+  integrity sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==
   dependencies:
     array-flatten "^2.1.2"
     dns-equal "^1.0.0"
@@ -1980,15 +1973,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.21.3, browserslist@^4.6.4:
-  version "4.21.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
-  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.6.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001370"
-    electron-to-chromium "^1.4.202"
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
     node-releases "^2.0.6"
-    update-browserslist-db "^1.0.5"
+    update-browserslist-db "^1.0.9"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2131,10 +2124,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001370:
-  version "1.0.30001376"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001376.tgz#af2450833e5a06873fbb030a9556ca9461a2736d"
-  integrity sha512-I27WhtOQ3X3v3it9gNs/oTpoE5KpwmqKR5oKPA8M0G7uMXh9Ty81Q904HpKUrM30ei7zfcL5jE7AXefgbOfMig==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400:
+  version "1.0.30001423"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001423.tgz#57176d460aa8cd85ee1a72016b961eb9aca55d91"
+  integrity sha512-09iwWGOlifvE1XuHokFMP7eR38a0JnajoyL3/i87c8ZjRWRrdKo1fqjNfugfBD0UDBIOz0U+jtNhJ0EPm1VleQ==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
@@ -2334,7 +2327,7 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-component-emitter@^1.2.1, component-emitter@~1.3.0:
+component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -2428,11 +2421,9 @@ content-type@~1.0.4:
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 cookie-signature@1.0.6:
   version "1.0.6"
@@ -2466,18 +2457,17 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz#d1af84a17e18dfdd401ee39da9996f9a7ba887de"
-  integrity sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==
+core-js-compat@^3.25.1:
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.0.tgz#94e2cf8ba3e63800c4956ea298a6473bc9d62b44"
+  integrity sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==
   dependencies:
-    browserslist "^4.21.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js@^3.16.2, core-js@^3.6.5:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f"
-  integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe"
+  integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2771,10 +2761,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
 
-date-format@^4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.13.tgz#87c3aab3a4f6f37582c5f5f63692d2956fa67890"
-  integrity sha512-bnYCwf8Emc3pTD8pXnre+wfnjGtfi5ncMDKy7+cWZXbmRAsdWkOQHrfC1yz/KiwP5thDp2kCHWYWKBX4HP1hoQ==
+date-format@^4.0.14:
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
+  integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
@@ -2901,13 +2891,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -2997,10 +2980,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.202:
-  version "1.4.219"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.219.tgz#a7a672304b6aa4f376918d3f63a47f2c3906009a"
-  integrity sha512-zoQJsXOUw0ZA0YxbjkmzBumAJRtr6je5JySuL/bAoFs0DuLiLJ+5FzRF7/ZayihxR2QcewlRZVm5QZdUhwjOgA==
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -3097,30 +3080,31 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
+  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
+    get-intrinsic "^1.1.3"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    is-callable "^1.2.4"
+    is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
+    object-inspect "^1.12.2"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
+    object.assign "^4.1.4"
     regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
     string.prototype.trimend "^1.0.5"
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
@@ -3256,13 +3240,14 @@ eslint-webpack-plugin@^2.6.0:
     schema-utils "^3.1.1"
 
 eslint@^8.18.0:
-  version "8.22.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48"
-  integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.10.4"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+  version "8.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
+  integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
+  dependencies:
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -3272,21 +3257,21 @@ eslint@^8.18.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.3"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
+    glob-parent "^6.0.2"
     globals "^13.15.0"
-    globby "^11.1.0"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -3298,12 +3283,11 @@ eslint@^8.18.0:
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2, espree@^9.3.3:
-  version "9.3.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d"
-  integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
@@ -3402,13 +3386,13 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
     homedir-polyfill "^1.0.1"
 
 express@^4.17.3:
-  version "4.18.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
-  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.0"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.5.0"
@@ -3427,7 +3411,7 @@ express@^4.17.3:
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.10.3"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.18.0"
@@ -3477,17 +3461,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3639,10 +3612,10 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatted@^3.1.0, flatted@^3.2.2, flatted@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
-  integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
+flatted@^3.1.0, flatted@^3.2.2, flatted@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -3658,9 +3631,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -3756,11 +3729,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -3776,10 +3744,10 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
-  integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
@@ -3811,20 +3779,20 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.1:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -3885,18 +3853,6 @@ globals@^13.15.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -4315,10 +4271,10 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-color-stop@^1.0.0:
   version "1.1.0"
@@ -4333,9 +4289,9 @@ is-color-stop@^1.0.0:
     rgba-regex "^1.0.0"
 
 is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
@@ -4458,6 +4414,11 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -4565,18 +4526,18 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-jasmine-core@^4.1.0, jasmine-core@^4.2.0, jasmine-core@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-4.3.0.tgz#aee841fbe7373c2586ed8d8d48f5cc4a88be8390"
-  integrity sha512-qybtBUesniQdW6n+QIHMng2vDOHscIC/dEXjW+JzO9+LoAZMb03RCUC5xFOv/btSKPm1xL42fn+RjlU4oB42Lg==
+jasmine-core@^4.1.0, jasmine-core@^4.2.0, jasmine-core@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-4.4.0.tgz#848fe45c1839cacaf1f2429d400d1d4f85d2856a"
+  integrity sha512-+l482uImx5BVd6brJYlaHe2UwfKoZBqQfNp20ZmdNfsjGFTemGfqHLsXjKEW23w9R/m8WYeFc9JmIgjj6dUtAA==
 
 jasmine@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-4.3.0.tgz#f99e9bc2a94e8281d2490482d53a3406760bd7f4"
-  integrity sha512-ieBmwkd8L1DXnvSnxx7tecXgA0JDgMXPAwBcqM4lLPedJeI9hTHuWifPynTC+dLe4Y+GkSPSlbqqrmYIgGzYUw==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-4.4.0.tgz#e3e359723d9679993b70de3e0441517c154b9647"
+  integrity sha512-xrbOyYkkCvgduNw7CKktDtNb+BwwBv/zvQeHpTkbxqQ37AJL5V4sY3jHoMIJPP/hTc3QxLVwOyxc87AqA+kw5g==
   dependencies:
     glob "^7.1.6"
-    jasmine-core "^4.3.0"
+    jasmine-core "^4.4.0"
 
 jest-worker@^26.5.0:
   version "26.6.2"
@@ -4609,15 +4570,20 @@ jquery-ui@^1.12.1:
     jquery ">=1.8.0 <4.0.0"
 
 "jquery@>=1.8.0 <4.0.0", jquery@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
-  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
+  integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
 
 js-cookie@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
   integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
+js-sdsl@^4.1.4:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
+  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4744,9 +4710,9 @@ karma-webpack@^4.0.2:
     webpack-dev-middleware "^3.7.0"
 
 karma@^6.3.14:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508"
-  integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.1.tgz#f2253716dd3a41aaa813fa9f54b6ee047e1127d9"
+  integrity sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -4838,9 +4804,9 @@ loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.3.tgz#d4b15b8504c63d1fc3f2ade52d41bc8459d6ede1"
+  integrity sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -4909,15 +4875,15 @@ lodash@^4.17.21, lodash@^4.17.5:
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log4js@^6.4.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.6.1.tgz#48f23de8a87d2f5ffd3d913f24ca9ce77895272f"
-  integrity sha512-J8VYFH2UQq/xucdNu71io4Fo+purYYudyErgBbswWKO0MC6QVOERRomt5su/z6d3RJSmLyTGmXl3Q/XjKCf+/A==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.7.0.tgz#fff671a74b2f6e956d135c3c756c79072809a23b"
+  integrity sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==
   dependencies:
-    date-format "^4.0.13"
+    date-format "^4.0.14"
     debug "^4.3.4"
-    flatted "^3.2.6"
+    flatted "^3.2.7"
     rfdc "^1.3.0"
-    streamroller "^3.1.2"
+    streamroller "^3.1.3"
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -5017,11 +4983,6 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5046,7 +5007,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5117,9 +5078,9 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -5229,9 +5190,9 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nan@^2.12.1:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
-  integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
+  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5379,7 +5340,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
+object-inspect@^1.12.2, object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
@@ -5396,10 +5357,10 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz#d36b7700ddf0019abb6b1df1bb13f6445f79051f"
-  integrity sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==
+object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
@@ -6495,10 +6456,10 @@ qjobs@^1.2.0:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.10.3:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
@@ -6608,10 +6569,10 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -6621,9 +6582,9 @@ regenerate@^1.4.2:
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5, regenerator-runtime@^0.13.9:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+  version "0.13.10"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"
+  integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==
 
 regenerator-transform@^0.15.0:
   version "0.15.0"
@@ -6655,26 +6616,26 @@ regexpp@^3.2.0:
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
-  integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139"
+  integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -6828,6 +6789,15 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -6852,9 +6822,9 @@ sass-loader@10.1.1:
     semver "^7.3.2"
 
 sass@^1.38.0:
-  version "1.54.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.4.tgz#803ff2fef5525f1dd01670c3915b4b68b6cba72d"
-  integrity sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==
+  version "1.55.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c"
+  integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -6907,18 +6877,13 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
-selfsigned@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
-  integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
+selfsigned@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
   dependencies:
     node-forge "^1"
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -6930,9 +6895,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@^7.3.2, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -7082,11 +7047,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -7122,26 +7082,25 @@ socket.io-adapter@~2.4.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
-socket.io-parser@~4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
-  integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
+socket.io-parser@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
+  integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==
   dependencies:
-    "@types/component-emitter" "^1.2.10"
-    component-emitter "~1.3.0"
+    "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
 socket.io@^4.4.1:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.1.tgz#aa7e73f8a6ce20ee3c54b2446d321bbb6b1a9029"
-  integrity sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.3.tgz#44dffea48d7f5aa41df4a66377c386b953bc521c"
+  integrity sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.2"
     engine.io "~6.2.0"
     socket.io-adapter "~2.4.0"
-    socket.io-parser "~4.0.4"
+    socket.io-parser "~4.2.0"
 
 sockjs@^0.3.24:
   version "0.3.24"
@@ -7317,12 +7276,12 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamroller@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.2.tgz#abd444560768b340f696307cf84d3f46e86c0e63"
-  integrity sha512-wZswqzbgGGsXYIrBYhOE0yP+nQ6XRk7xDcYwuQAGTYXdyAUmvgVFE0YU1g5pvQT0m7GBaQfYcSnlHbapuK0H0A==
+streamroller@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.3.tgz#d95689a8c29b30d093525d0baffe6616fd62ca7e"
+  integrity sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==
   dependencies:
-    date-format "^4.0.13"
+    date-format "^4.0.14"
     debug "^4.3.4"
     fs-extra "^8.1.0"
 
@@ -7536,9 +7495,9 @@ terser@^4.1.2:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.14.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c"
+  integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
@@ -7581,9 +7540,9 @@ timsort@^0.3.0:
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
 tinymce@^5.10.0:
-  version "5.10.5"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.5.tgz#02aef6a67e915f1559e51fa8fb007270d9666778"
-  integrity sha512-nFKtLhmoRtExBxUfv06JlkbQWux5D+d115vxSRAqUmccZdrtpFvOIYwZmikvulLdM9pfEpvO0B+RQ2qFV/+R7w==
+  version "5.10.6"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.6.tgz#ea03927e9d20c035619dfd32ec4fd471c55e32c5"
+  integrity sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw==
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -7685,9 +7644,9 @@ typedarray@^0.0.6:
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 ua-parser-js@^0.7.30:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+  version "0.7.32"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211"
+  integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -7718,9 +7677,9 @@ unicode-match-property-value-ecmascript@^2.0.0:
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
-  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -7784,10 +7743,10 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
-  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -7861,7 +7820,7 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+v8-compile-cache@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -7964,9 +7923,9 @@ webpack-dev-middleware@^5.3.1:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz#de270d0009eba050546912be90116e7fd740a9ca"
-  integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5"
+  integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -7991,7 +7950,7 @@ webpack-dev-server@^4.7.3:
     p-retry "^4.5.0"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
-    selfsigned "^2.0.1"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
@@ -8123,9 +8082,9 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.4.2:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
-  integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
+  integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
 
 ws@~8.2.3:
   version "8.2.3"

From a9891939a6675d46b22f7ef18563f626673bcc9a Mon Sep 17 00:00:00 2001
From: pengyin-shan <wendy.shan@hotmail.com>
Date: Mon, 24 Oct 2022 11:28:54 -0400
Subject: [PATCH 91/95] commented our Capybara.start

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8d1add27e0..bda162c5c8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -117,7 +117,7 @@
   # Enable Capybara webmocks if we are testing a feature
   config.before(:each) do |example|
     if example.metadata[:type] == :feature
-      Capybara::Webmock.start
+      # Capybara::Webmock.start
 
       # Allow Capybara to make localhost requests and also contact the
       # google api chromedriver store

From 90d489b2dac38d18fbfa6c44686f849f6a6ede18 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Mon, 24 Oct 2022 17:50:04 +0200
Subject: [PATCH 92/95] Fixed tests by adding default visibility to template &
 plan test factories

---
 spec/factories/plans.rb     | 1 +
 spec/factories/templates.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/spec/factories/plans.rb b/spec/factories/plans.rb
index f0a3f1b630..c07d002ec7 100644
--- a/spec/factories/plans.rb
+++ b/spec/factories/plans.rb
@@ -42,6 +42,7 @@
 FactoryBot.define do
   factory :plan do
     title { Faker::Company.bs }
+    visibility { Plan.visibilities[:privately_visible] }
     template
     org
     identifier { SecureRandom.hex }
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index 3b38a95f93..a947178f89 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -37,6 +37,7 @@
     org
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraph }
+    visibility { Template.visibilities[:organisationally_visible] }
     locale { 'en_GB' }
     is_default { false }
     published { false }

From e57640ec323a4dbeb97bd0ba9ff0fbe88bb19b23 Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 25 Oct 2022 08:52:13 +0200
Subject: [PATCH 93/95] Fixed template tests

---
 app/models/template.rb      | 1 +
 spec/factories/templates.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/template.rb b/app/models/template.rb
index 27add23a2c..175235d0b3 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -61,6 +61,7 @@ class Template < ApplicationRecord
   attribute :version, :integer, default: 0
   attribute :customization_of, :integer, default: nil
   attribute :family_id, :integer, default: -> { Template.new_family_id }
+  attribute :visibility, default: Template.visibilities[:organisationally_visible]
 
   # ================
   # = Associations =
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index a947178f89..3b38a95f93 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -37,7 +37,6 @@
     org
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraph }
-    visibility { Template.visibilities[:organisationally_visible] }
     locale { 'en_GB' }
     is_default { false }
     published { false }

From 7cf0dc5f782f69887a91f511c90309bc378cf8cd Mon Sep 17 00:00:00 2001
From: Benjamin FAURE <benjamin.faure@inist.fr>
Date: Tue, 25 Oct 2022 08:54:23 +0200
Subject: [PATCH 94/95] Rubocoped everything

---
 app/controllers/notes_controller.rb                 | 1 -
 app/controllers/org_admin/departments_controller.rb | 2 +-
 app/controllers/orgs_controller.rb                  | 4 ++--
 app/controllers/registrations_controller.rb         | 6 +++---
 app/controllers/users_controller.rb                 | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index ae863c5eff..bba42c8bd8 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -3,7 +3,6 @@
 # Controller for the Comments section of the Write Plan page
 class NotesController < ApplicationController
   include ConditionalUserMailer
-  require 'pp'
   after_action :verify_authorized
   respond_to :html
 
diff --git a/app/controllers/org_admin/departments_controller.rb b/app/controllers/org_admin/departments_controller.rb
index 8613a484c6..b77ae38503 100644
--- a/app/controllers/org_admin/departments_controller.rb
+++ b/app/controllers/org_admin/departments_controller.rb
@@ -60,7 +60,7 @@ def destroy
       @department = Department.find(params[:id])
       @org_id = org_id
       authorize @department
-      url = "#{admin_edit_org_path(@org_id)}\#departments"
+      url = "#{admin_edit_org_path(@org_id)}#departments"
 
       if @department.destroy
         flash[:notice] = success_message(@department, _('deleted'))
diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index e2d8129f8f..ed0e3f78df 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -88,11 +88,11 @@ def admin_update
         end
         @org.save
       end
-      redirect_to "#{admin_edit_org_path(@org)}\##{tab}",
+      redirect_to "#{admin_edit_org_path(@org)}##{tab}",
                   notice: success_message(@org, _('saved'))
     else
       failure = failure_message(@org, _('save')) if failure.blank?
-      redirect_to "#{admin_edit_org_path(@org)}\##{tab}", alert: failure
+      redirect_to "#{admin_edit_org_path(@org)}##{tab}", alert: failure
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 16967c3c33..53492a3f9e 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -249,7 +249,7 @@ def do_update(require_password = true, confirm = false)
       set_flash_message :notice, success_message(current_user, _('saved'))
       # Sign in the user bypassing validation in case his password changed
       sign_in current_user, bypass: true
-      redirect_to "#{edit_user_registration_path}\#personal-details",
+      redirect_to "#{edit_user_registration_path}#personal-details",
                   notice: success_message(current_user, _('saved'))
 
     else
@@ -280,12 +280,12 @@ def do_update_password(current_user, args)
       set_flash_message :notice, success_message(current_user, _('saved'))
       # TODO: this method is deprecated
       sign_in current_user, bypass: true
-      redirect_to "#{edit_user_registration_path}\#password-details",
+      redirect_to "#{edit_user_registration_path}#password-details",
                   notice: success_message(current_user, _('saved'))
 
     else
       flash[:alert] = message.blank? ? failure_message(current_user, _('save')) : message
-      redirect_to "#{edit_user_registration_path}\#password-details"
+      redirect_to "#{edit_user_registration_path}#password-details"
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d3496e7221..def9e66356 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -127,7 +127,7 @@ def update_email_preferences
     pref.save
 
     # Include active tab in redirect path
-    redirect_to "#{edit_user_registration_path}\#notification-preferences",
+    redirect_to "#{edit_user_registration_path}#notification-preferences",
                 notice: success_message(pref, _('saved'))
   end
   # rubocop:enable Metrics/AbcSize

From e7e7ad607d5d524fe445c04879fd12991dad76fe Mon Sep 17 00:00:00 2001
From: marta <marta@martas-MacBook-Air.local>
Date: Tue, 25 Oct 2022 17:05:52 +0100
Subject: [PATCH 95/95] Translation.io new sync for rails6 25/10/2022

---
 config/locale/app.pot                  | 529 +++++++++++---------
 config/locale/de/LC_MESSAGES/app.mo    | Bin 153592 -> 153983 bytes
 config/locale/de/app.po                | 533 +++++++++++---------
 config/locale/en_CA/LC_MESSAGES/app.mo | Bin 630 -> 630 bytes
 config/locale/en_CA/app.po             | 529 +++++++++++---------
 config/locale/en_GB/LC_MESSAGES/app.mo | Bin 1916 -> 1916 bytes
 config/locale/en_GB/app.po             | 529 +++++++++++---------
 config/locale/en_US/LC_MESSAGES/app.mo | Bin 21173 -> 21173 bytes
 config/locale/en_US/app.po             | 529 +++++++++++---------
 config/locale/es/LC_MESSAGES/app.mo    | Bin 150453 -> 150899 bytes
 config/locale/es/app.po                | 533 +++++++++++---------
 config/locale/fi/LC_MESSAGES/app.mo    | Bin 145266 -> 145673 bytes
 config/locale/fi/app.po                | 533 +++++++++++---------
 config/locale/fr_CA/LC_MESSAGES/app.mo | Bin 129392 -> 129392 bytes
 config/locale/fr_CA/app.po             | 529 +++++++++++---------
 config/locale/fr_FR/LC_MESSAGES/app.mo | Bin 153379 -> 153769 bytes
 config/locale/fr_FR/app.po             | 643 +++++++++++++------------
 config/locale/pt_BR/LC_MESSAGES/app.mo | Bin 148861 -> 149294 bytes
 config/locale/pt_BR/app.po             | 533 +++++++++++---------
 config/locale/sv_FI/LC_MESSAGES/app.mo | Bin 144987 -> 145388 bytes
 config/locale/sv_FI/app.po             | 533 +++++++++++---------
 config/locale/tr_TR/LC_MESSAGES/app.mo | Bin 132810 -> 132810 bytes
 config/locale/tr_TR/app.po             | 529 +++++++++++---------
 config/locales/.translation_io         |   2 +-
 config/locales/translation.de.yml      |   9 +
 config/locales/translation.en-CA.yml   |   3 +
 config/locales/translation.en-GB.yml   |   3 +
 config/locales/translation.en-US.yml   |   5 +-
 config/locales/translation.es.yml      |  10 +
 config/locales/translation.fi.yml      |   7 +
 config/locales/translation.fr-CA.yml   |  11 +
 config/locales/translation.fr-FR.yml   |  11 +
 config/locales/translation.pt-BR.yml   |  12 +
 config/locales/translation.sv-FI.yml   |  10 +
 config/locales/translation.tr-TR.yml   |   8 +
 35 files changed, 3648 insertions(+), 2925 deletions(-)

diff --git a/config/locale/app.pot b/config/locale/app.pot
index 4f6353f2da..dfc1d9e076 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 11:27+0000\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 16:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -133,7 +133,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -233,19 +233,15 @@ msgstr ""
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -261,37 +257,37 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -300,7 +296,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -308,7 +304,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -331,14 +327,14 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -347,14 +343,14 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -363,57 +359,57 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
@@ -443,19 +439,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -545,7 +541,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr ""
 
@@ -581,33 +577,33 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr ""
 
@@ -644,33 +640,33 @@ msgstr ""
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -914,27 +910,27 @@ msgstr ""
 msgid "Unable to link your account to %{scheme}."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr ""
 
@@ -984,7 +980,7 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1105,7 +1101,7 @@ msgid "Public"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr ""
 
@@ -1118,7 +1114,7 @@ msgid "Public: anyone can view."
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
@@ -1277,75 +1273,130 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1359,12 +1410,12 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr ""
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr ""
 
@@ -1389,15 +1440,15 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1429,11 +1480,11 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr ""
 
@@ -1461,7 +1512,7 @@ msgstr ""
 msgid "guidance on"
 msgstr ""
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr ""
 
@@ -1497,51 +1548,51 @@ msgstr ""
 msgid "Invalid maximum pages"
 msgstr ""
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr ""
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
@@ -1692,11 +1743,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
@@ -1748,7 +1799,7 @@ msgstr ""
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1756,7 +1807,7 @@ msgstr ""
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1890,7 +1941,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1925,7 +1976,7 @@ msgid "Roles"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1935,7 +1986,7 @@ msgstr ""
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -1948,7 +1999,7 @@ msgid "Remove"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2371,6 +2422,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2417,7 +2469,7 @@ msgid ""
 "this subset guidance when answering questions in the 'create plan' wizard."
 msgstr ""
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr ""
 
@@ -2542,23 +2594,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr ""
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr ""
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr ""
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr ""
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr ""
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr ""
 
@@ -2733,113 +2785,113 @@ msgstr ""
 msgid "Notice:"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -2856,11 +2908,11 @@ msgid "Add Comment"
 msgstr ""
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3121,7 +3173,7 @@ msgstr ""
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3288,33 +3340,33 @@ msgstr ""
 msgid "Themed Guidance"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
 "ing their plan."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr ""
 
@@ -3379,7 +3431,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3392,7 +3444,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3440,7 +3492,7 @@ msgstr ""
 msgid "Template details"
 msgstr ""
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr ""
 
@@ -3777,7 +3829,7 @@ msgid "Homepage"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr ""
 
@@ -3819,7 +3871,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3828,7 +3880,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3837,21 +3889,21 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -3952,14 +4004,14 @@ msgstr ""
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr ""
 
@@ -4172,79 +4224,79 @@ msgstr ""
 msgid "Instructions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -4780,39 +4832,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -4882,7 +4934,7 @@ msgid "Filter plans"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr ""
 
@@ -4891,45 +4943,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr ""
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -4968,15 +5016,15 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
@@ -5604,6 +5652,11 @@ msgstr ""
 msgid "First, search for a user by email, then select them from the list."
 msgstr ""
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo
index b053f21c1b91ed440efda1975de6d2f0aa437bea..f9205e9ce98ff149ebe7c06ae0f497f97e6bda62 100644
GIT binary patch
delta 26287
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
D$SBrv

delta 25960
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

diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index 5085dc6937..05b3a17607 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -139,8 +139,8 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Bitte melden Sie sich an oder registrieren Sie sich bevor Sie fortfahren."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "%{action} %{object} kann nicht ausgeführt werden. {Fehler}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "%{action} %{object} kann nicht ausgeführt werden. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
@@ -241,19 +241,15 @@ msgstr "Der Suchbereich reagiert nicht auf jeden"
 msgid "The search space does not have elements associated"
 msgstr "Dem Suchbereich sind keine Elemente zugeordnet"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Sie müssen angemeldet sein, um diese Funktion nutzen zu können"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Die Captcha-Überprüfung ist fehlgeschlagen. Versuchen Sie es erneut."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Die Nachricht wurde erfolgreich versendet."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Ihre Anfrage konnte nicht gesendet werden"
 
@@ -269,37 +265,37 @@ msgid "added"
 msgstr "Hinzugefügt"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "gespeichert"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -308,7 +304,7 @@ msgstr "Speichern"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -316,7 +312,7 @@ msgstr "entfernt"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -339,14 +335,14 @@ msgstr "Ihre Anfrage zum Feedback kann derzeit nicht gesendet werden."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Bei der Anforderung von Feedback für diesen Plan ist ein Fehler aufgetreten."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -355,14 +351,14 @@ msgstr "Bei der Anforderung von Feedback für diesen Plan ist ein Fehler aufgetr
 msgid "created"
 msgstr "Erstellt"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -371,61 +367,61 @@ msgstr "Erstellt"
 msgid "create"
 msgstr "Erstellen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Ihre Hinweisgruppe wurde veröffentlicht und steht nun Nutzer/innen zur Verfügu"
 "ng."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "veröffentlichen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Ihre Beratungsgruppe wird nicht mehr veröffentlicht und steht Nutzer/innen nic"
 "ht mehr zur Verfügung."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "Veröffentlichung zurückziehen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "Gelöscht"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "Löschen"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Ihre Anleitung wurde veröffentlicht und steht nun Nutzer/innen zur Verfügung."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Ihre Anleitung wird nicht mehr veröffentlicht und steht Benutzern nicht mehr z"
@@ -459,19 +455,19 @@ msgstr "Es kann keine neue Version dieser Vorlage erstellt werden.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "aktualisiert"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -567,7 +563,7 @@ msgid "Unable to delete this version of the template."
 msgstr "Diese Version der Vorlage kann nicht gelöscht werden."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "Kopieren"
 
@@ -603,35 +599,35 @@ msgstr "Eigene Vorlagen"
 msgid "Customizable Templates"
 msgstr "Anpassbare Vorlagen"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Fehler beim Analysieren von Links für eine %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 "Vorlage, die mit dem Service %{application_name} erstellt wurde. Zuletzt geänd"
 "ert %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Die DMP-Vorlage kann zu diesem Zeitpunkt nicht heruntergeladen werden."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Derzeit sind keine Organisationen registriert."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Bitte wählen Sie eine Organisation"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Ihre Organisation scheint nicht ordnungsgemäß konfiguriert zu sein."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Erstellt mit %{application_name}. Zuletzt geändert am %{date}"
 
@@ -668,11 +664,11 @@ msgstr "Dieser Plan basiert auf dem"
 msgid "template with customisations by the"
 msgstr "Vorlage mit Anpassungen durch die"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "Kopiert"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -680,23 +676,23 @@ msgstr ""
 "Der Status des Plans konnte nicht geändert werden, da mindestens %{percentage}"
 " Prozentsatz angefordert wurde"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Plan-ID konnte nicht gefunden werden %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Ihr Projekt ist jetzt ein Test."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Ihr Projekt ist kein Test mehr."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Der Teststatus des Plans konnte nicht geändert werden"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "ID %{ ist kein Plan zugeordnet<id}> S"
 
@@ -970,27 +966,27 @@ msgstr "Ihr Konto wurde erfolgreich mit %{scheme} verknüpft."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Ihr Konto konnte nicht mit %{scheme} verknüpft werden."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "Erfolgreich %{action} %{username} Konto."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "Aktiviert"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "Deaktiviert"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "Kann nicht zu %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "Aktivieren"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "Deaktivieren"
 
@@ -1046,7 +1042,7 @@ msgid "Creators:"
 msgstr "Erzeuger:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1174,7 +1170,7 @@ msgid "Public"
 msgstr "Öffentlichkeit"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Private"
 
@@ -1187,7 +1183,7 @@ msgid "Public: anyone can view."
 msgstr "Öffentlich: Jeder kann sehen."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privat: beschränkt auf mich und Leute, die ich einlade."
 
@@ -1346,75 +1342,130 @@ msgstr "Frage"
 msgid "Answer"
 msgstr "Antwort"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Angepasst von:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Titel:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Erzeuger:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Hauptermittler:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Datumsmanager:"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Projektleiter:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Mitwirkender:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Zugehörigkeit:"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Vorlage:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Grant Nummer:"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Projekt Zusammenfassung:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Zuletzt bearbeitet:"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Informationen zu Urheberrechten:"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1438,12 +1489,12 @@ msgstr ""
 "             bedeutet nicht, dass der (die) Schöpfer (s) sich mit\n"
 "             Ihr Projekt oder Vorschlag"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Nicht beantwortet"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "darf nicht leer sein"
 
@@ -1468,15 +1519,15 @@ msgstr "'Fragetext' muss ausgefüllt werden."
 msgid "You must specify at least one role."
 msgstr "Sie müssen mindestens eine Rolle angeben."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "darf nicht leer sein."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "darf nicht leer sein, wenn keine E-Mail-Adresse angegeben ist."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "darf nicht leer sein, wenn kein Name angegeben ist."
 
@@ -1509,11 +1560,11 @@ msgstr "bereits einen Wert zugewiesen"
 msgid "Feedback email message"
 msgstr "Feedback-Nachricht"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "muss eines der folgenden Formate sein: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "kann nicht größer als 500KB sein"
 
@@ -1541,7 +1592,7 @@ msgstr "muss nach dem Startdatum liegen"
 msgid "guidance on"
 msgstr "Hinweise zu"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "kann nicht kleiner als Null sein"
 
@@ -1577,53 +1628,53 @@ msgstr "Unbekannte Formatierungseinstellung"
 msgid "Invalid maximum pages"
 msgstr "Ungültige maximale Anzahl von Seiten"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Eine alte Vorlage kann nicht zur Bearbeitung wiederhergestellt werden"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! erfordert ein Organisationsziel"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Kopie von %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generate_version! benötigt eine veröffentlichte Vorlage"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "customize! erfordert ein Organisationsziel"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "customize! benötigt eine Vorlage von einem Forschungsförderer"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Sie können keine bereits veröffentlichte Vorlage erneut veröffentlichen."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Sie können keine veraltete Version dieser Vorlage veröffentlichen."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Sie können keine Vorlage ohne Phasen veröffentlichen."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 "Sie können keine Vorlage veröffentlichen, deren Phasen keine Abschnitte enthal"
 "ten."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Sie können keine Vorlage veröffentlichen, die Abschnitte ohne Fragen enthält."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Die Bedingungen in der Vorlage beziehen sich rückwärts"
 
@@ -1786,11 +1837,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "muss nach dem %{date} erfolgen"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Ein Schlüssel \"org\" wird für den Link-Hash erwartet"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Für Links wird ein Hash erwartet"
@@ -1844,7 +1895,7 @@ msgstr "Bitte warten Sie, die Standards werden geladen"
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1852,7 +1903,7 @@ msgstr "Bitte warten Sie, die Standards werden geladen"
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1992,7 +2043,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2027,7 +2078,7 @@ msgid "Roles"
 msgstr "Rollen"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2037,7 +2088,7 @@ msgstr "Rollen"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2050,7 +2101,7 @@ msgid "Remove"
 msgstr "Entfernen"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2520,6 +2571,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Hast du einen %{application_name}-Account?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2576,7 +2628,7 @@ msgstr ""
 "Die Nutzer können die Anzeige von Hilfestellungen dieser Untergruppe im 'Plan "
 "erstellen'-Assistenten auswählen."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (z.B. Institut / Einrichtung)"
 
@@ -2725,23 +2777,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Erste Schritte:"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "zuerst"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Letzte"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Nächster"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Früher"
 
@@ -2916,42 +2968,42 @@ msgstr "Error:"
 msgid "Notice:"
 msgstr "Beachten:"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Laden..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Dieses Feld wird benötigt."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Wählen Sie eine Organisation aus der Liste aus."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Meine Organisation ist nicht aufgeführt"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "N / A"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Liste ausblenden"
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Siehe die vollständige Liste der Partnereinrichtungen."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2959,27 +3011,27 @@ msgstr ""
 "Es konnte keine geeignete Vorlage für die von Ihnen ausgewählte Forschungsorga"
 "nisation und den ausgewählten Geldgeber gefunden werden."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr "Bitte wählen Sie eine Forschungsorganisation und Förderer, um fortzufahren."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Laden ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Der Inhalt des Abschnitts konnte zu diesem Zeitpunkt nicht geladen werden."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Der Inhalt der Frage konnte zu diesem Zeitpunkt nicht geladen werden."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Wird in einem neuen Fenster geöffnet"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2990,45 +3042,45 @@ msgstr ""
 "en Vorschlag auszuwählen, oder die Escape-Taste, um die Vorschläge zu schließe"
 "n."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Für Ihren Eintrag sind keine Ergebnisse verfügbar."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Suchen ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr "- Geben Sie einen Suchbegriff ein %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr "Keine Ergebnisse entsprechen Ihren Filterkriterien."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "Nah dran"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr "%{topic} suchen"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Filter anwenden"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Klicken, um %{item_name} auszuwählen"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Zum Entfernen anklicken %{item_name}"
 
@@ -3045,11 +3097,11 @@ msgid "Add Comment"
 msgstr "Einen Kommentar hinzufügen"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3324,7 +3376,7 @@ msgstr "Art"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3509,7 +3561,7 @@ msgstr "Keine Themen ausgewählt"
 msgid "Themed Guidance"
 msgstr "Themenspezifische Erläuterungen"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3517,7 +3569,7 @@ msgstr ""
 "Klicken Sie auf die folgenden Links, um Anleitungen Ihrer Einrichtung anzuzeig"
 "en, die sich auf das in dieser Frage behandelte Thema beziehen."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3527,7 +3579,7 @@ msgstr ""
 " die Möglichkeit, die Anleitung beim Bearbeiten ihres Plans ein- und auszublen"
 "den."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3535,14 +3587,14 @@ msgstr ""
 "Zu den Themen, auf die sich diese Frage bezieht, gibt es keine Erläuterungen I"
 "hrer Einrichtung."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Anmerkungen"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Keine zur Verfügung gestellt"
 
@@ -3619,7 +3671,7 @@ msgstr "Status"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3632,7 +3684,7 @@ msgstr "Veröffentlicht"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3684,7 +3736,7 @@ msgstr ""
 msgid "Template details"
 msgstr "Details der Vorlage"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Fügen Sie eine neue Phase hinzu."
 
@@ -4051,7 +4103,7 @@ msgid "Homepage"
 msgstr "Startseite"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -4097,7 +4149,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Optionale Untergruppe"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4106,7 +4158,7 @@ msgstr "Optionale Untergruppe"
 msgid "No"
 msgstr "Keine"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4115,21 +4167,21 @@ msgstr "Keine"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Unpublish"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4243,14 +4295,14 @@ msgstr "Download"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -4489,81 +4541,81 @@ msgstr "Kommentare & Anleitung"
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Format"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Einstellungen herunterladen"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Wählen Sie die Phase zum Herunterladen aus"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Optionale Plankomponenten"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "Deckblatt Projektdetails"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "Fragetext und Abschnittsüberschriften"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "unbeantwortete Fragen"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr "Forschungsergebnisse"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr ""
 "ergänzende(r) Abschnitt(e), die von der Förderorganisation nicht gefordert wer"
 "den"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "PDF-Formatierung"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Schrift"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Rand (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Schriftart"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Größe"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Oben"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Seitenende"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Links"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Rechts"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5173,39 +5225,39 @@ msgstr "- Fachgebiet auswählen -"
 msgid "- Select a repository type -"
 msgstr "- Wählen Sie einen Repository-Typ aus -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr "Klicken Sie hier, um Repositories im Zusammenhang mit %{subject} anzuzeigen"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Mehr Info"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr "Repository-URL"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Datenzugriff"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr "Persistenter ID-Typ"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Daten hochladen"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "Anbietertyp"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr "Repository-Typ"
 
@@ -5275,7 +5327,7 @@ msgid "Filter plans"
 msgstr "Filterung der Pläne"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Frage nicht beantwortet."
 
@@ -5284,45 +5336,41 @@ msgid "Plan Overview"
 msgstr "Planübersicht"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "Ein Datenmanagementplan, der mit %{application_name} erstellt wurde."
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Titel:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Zugehörigkeit:"
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Datenmanager:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Geldgeber:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ORCIDID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "ICH WÜRDE:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Anfangsdatum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Endtermin:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Grant-Nummer / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5367,8 +5415,8 @@ msgstr "Kann personenbezogene Daten enthalten?"
 msgid "Begin typing to see a list of suggestions."
 msgstr "Beginnen Sie mit der Eingabe, um eine Liste mit Vorschlägen anzuzeigen."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5378,7 +5426,7 @@ msgstr ""
 "prüfen Sie, ob Ihre Organisation nicht in einer etwas anderen Form in der List"
 "e angezeigt wird."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Der von Ihnen eingegebene Name war keiner der aufgeführten Vorschläge!"
 
@@ -6195,6 +6243,11 @@ msgstr ""
 "Suchen Sie zuerst per E-Mail nach einem Benutzer und wählen Sie ihn dann aus d"
 "er Liste aus."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "Ursprünglich"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo
index 0f418ba5122542d81b8110c71094eb944b14736c..5b531deb7aed9d68b4d016acc9b1b849a9cd01e9 100644
GIT binary patch
delta 40
ocmeyy@{MJKA|tn<fv%CMf}xp}fzf0gMp+o&0?6MS!l=Xu0MX0|7XSbN

delta 40
ocmeyy@{MJKA|tnfiLQaUf}x?6k@;jDMp+o&7|7oo!l=Xu0Mc#=ApigX

diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po
index d6d98b5008..c0ab990ba8 100644
--- a/config/locale/en_CA/app.po
+++ b/config/locale/en_CA/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:02+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_CA\n"
@@ -133,7 +133,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -233,19 +233,15 @@ msgstr ""
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -261,37 +257,37 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -300,7 +296,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -308,7 +304,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -331,14 +327,14 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -347,14 +343,14 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -363,57 +359,57 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
@@ -443,19 +439,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -545,7 +541,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr ""
 
@@ -581,33 +577,33 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr ""
 
@@ -644,33 +640,33 @@ msgstr ""
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -914,27 +910,27 @@ msgstr ""
 msgid "Unable to link your account to %{scheme}."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr ""
 
@@ -984,7 +980,7 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1105,7 +1101,7 @@ msgid "Public"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr ""
 
@@ -1118,7 +1114,7 @@ msgid "Public: anyone can view."
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
@@ -1277,75 +1273,130 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1359,12 +1410,12 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr ""
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "can't be blank"
 
@@ -1389,15 +1440,15 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1430,11 +1481,11 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr ""
 
@@ -1462,7 +1513,7 @@ msgstr ""
 msgid "guidance on"
 msgstr ""
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr ""
 
@@ -1498,51 +1549,51 @@ msgstr ""
 msgid "Invalid maximum pages"
 msgstr ""
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr ""
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
@@ -1693,11 +1744,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
@@ -1749,7 +1800,7 @@ msgstr ""
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1757,7 +1808,7 @@ msgstr ""
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1891,7 +1942,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1926,7 +1977,7 @@ msgid "Roles"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1936,7 +1987,7 @@ msgstr ""
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -1949,7 +2000,7 @@ msgid "Remove"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2372,6 +2423,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2418,7 +2470,7 @@ msgid ""
 "this subset guidance when answering questions in the 'create plan' wizard."
 msgstr ""
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr ""
 
@@ -2543,23 +2595,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr ""
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr ""
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr ""
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr ""
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr ""
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr ""
 
@@ -2734,113 +2786,113 @@ msgstr ""
 msgid "Notice:"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -2857,11 +2909,11 @@ msgid "Add Comment"
 msgstr ""
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3122,7 +3174,7 @@ msgstr ""
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3289,33 +3341,33 @@ msgstr ""
 msgid "Themed Guidance"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
 "ing their plan."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr ""
 
@@ -3380,7 +3432,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3393,7 +3445,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3441,7 +3493,7 @@ msgstr ""
 msgid "Template details"
 msgstr ""
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr ""
 
@@ -3778,7 +3830,7 @@ msgid "Homepage"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr ""
 
@@ -3820,7 +3872,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3829,7 +3881,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3838,21 +3890,21 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -3953,14 +4005,14 @@ msgstr ""
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr ""
 
@@ -4173,79 +4225,79 @@ msgstr ""
 msgid "Instructions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -4781,39 +4833,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -4883,7 +4935,7 @@ msgid "Filter plans"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr ""
 
@@ -4892,45 +4944,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr ""
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -4969,15 +5017,15 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
@@ -5605,6 +5653,11 @@ msgstr ""
 msgid "First, search for a user by email, then select them from the list."
 msgstr ""
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo
index e868fc91406119e4ee1db1efca4295ccd63e126f..8e54d9cdf7bc3da37ab6c8d54cc0c794f286eb3b 100644
GIT binary patch
delta 40
pcmeyv_lIvo3JbTPfv%CMf}xp}fzjlA7FihI!pgvS^K_P{OaSOU3eErk

delta 40
ocmeyv_lIvo3JbS^iLQaUf}x?6k@@6&7FihI7|7o|o#iPL0O;BZ*8l(j

diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index d63fc79447..3f335f8a56 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_GB\n"
@@ -133,7 +133,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -233,19 +233,15 @@ msgstr ""
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Contact email was successfully sent."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -261,37 +257,37 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -300,7 +296,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -308,7 +304,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -331,14 +327,14 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -347,14 +343,14 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -363,57 +359,57 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
@@ -443,19 +439,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -545,7 +541,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr ""
 
@@ -581,33 +577,33 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr "Customisable Templates"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr ""
 
@@ -644,33 +640,33 @@ msgstr ""
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -914,27 +910,27 @@ msgstr ""
 msgid "Unable to link your account to %{scheme}."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr ""
 
@@ -984,7 +980,7 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1105,7 +1101,7 @@ msgid "Public"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr ""
 
@@ -1118,7 +1114,7 @@ msgid "Public: anyone can view."
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
@@ -1277,75 +1273,130 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1359,12 +1410,12 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr ""
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "can't be blank"
 
@@ -1389,15 +1440,15 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1430,11 +1481,11 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr ""
 
@@ -1462,7 +1513,7 @@ msgstr ""
 msgid "guidance on"
 msgstr ""
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr ""
 
@@ -1498,51 +1549,51 @@ msgstr ""
 msgid "Invalid maximum pages"
 msgstr ""
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr ""
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
@@ -1693,11 +1744,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
@@ -1749,7 +1800,7 @@ msgstr ""
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1757,7 +1808,7 @@ msgstr ""
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1891,7 +1942,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1926,7 +1977,7 @@ msgid "Roles"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1936,7 +1987,7 @@ msgstr ""
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -1949,7 +2000,7 @@ msgid "Remove"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2372,6 +2423,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2418,7 +2470,7 @@ msgid ""
 "this subset guidance when answering questions in the 'create plan' wizard."
 msgstr ""
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr ""
 
@@ -2543,23 +2595,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr ""
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr ""
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr ""
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr ""
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr ""
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr ""
 
@@ -2734,113 +2786,113 @@ msgstr ""
 msgid "Notice:"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -2857,11 +2909,11 @@ msgid "Add Comment"
 msgstr ""
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3122,7 +3174,7 @@ msgstr ""
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3289,33 +3341,33 @@ msgstr ""
 msgid "Themed Guidance"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
 "ing their plan."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr ""
 
@@ -3380,7 +3432,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3393,7 +3445,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3441,7 +3493,7 @@ msgstr ""
 msgid "Template details"
 msgstr ""
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr ""
 
@@ -3778,7 +3830,7 @@ msgid "Homepage"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr ""
 
@@ -3820,7 +3872,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3829,7 +3881,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3838,21 +3890,21 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -3953,14 +4005,14 @@ msgstr ""
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr ""
 
@@ -4175,79 +4227,79 @@ msgstr ""
 msgid "Instructions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -4783,39 +4835,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -4885,7 +4937,7 @@ msgid "Filter plans"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr ""
 
@@ -4894,45 +4946,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr ""
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -4971,15 +5019,15 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
@@ -5607,6 +5655,11 @@ msgstr ""
 msgid "First, search for a user by email, then select them from the list."
 msgstr ""
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo
index 70140bba7484132fe5a92ffa44c2a52817ab06ab..de80a35841ed90af319d8e2e6d43ce562ac03021 100644
GIT binary patch
delta 42
rcmdnGlyU1)#tjO3+=d3aMy3jeW>yA9leP6^VSEcK1LMuXdPyn({A~)s

delta 42
qcmdnGlyU1)#tjO3+y*AP2IdNehE_)AleP6^VSHmCe{-;2k_rI*2@1*p

diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index 32ac2ed3ee..05fff1dd29 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -133,7 +133,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -233,19 +233,15 @@ msgstr ""
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Contact email was successfully sent."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -261,37 +257,37 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -300,7 +296,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -308,7 +304,7 @@ msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -331,14 +327,14 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -347,14 +343,14 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -363,57 +359,57 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
@@ -443,19 +439,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -545,7 +541,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr ""
 
@@ -581,33 +577,33 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr "Customizable Templates"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "No organizations are currently registered."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Please choose an organization"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Your organization does not seem to be properly configured."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr ""
 
@@ -644,33 +640,33 @@ msgstr ""
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -918,27 +914,27 @@ msgstr ""
 msgid "Unable to link your account to %{scheme}."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr ""
 
@@ -988,7 +984,7 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1109,7 +1105,7 @@ msgid "Public"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr ""
 
@@ -1122,7 +1118,7 @@ msgid "Public: anyone can view."
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
@@ -1281,75 +1277,130 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Customized By: "
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1363,12 +1414,12 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr ""
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "can't be blank"
 
@@ -1393,15 +1444,15 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1434,11 +1485,11 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr ""
 
@@ -1466,7 +1517,7 @@ msgstr ""
 msgid "guidance on"
 msgstr ""
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr ""
 
@@ -1502,51 +1553,51 @@ msgstr ""
 msgid "Invalid maximum pages"
 msgstr ""
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requires an organization target"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr ""
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "customize! requires an organization target"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
@@ -1697,11 +1748,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
@@ -1753,7 +1804,7 @@ msgstr ""
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1761,7 +1812,7 @@ msgstr ""
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1895,7 +1946,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1930,7 +1981,7 @@ msgid "Roles"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1940,7 +1991,7 @@ msgstr ""
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -1953,7 +2004,7 @@ msgid "Remove"
 msgstr ""
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2380,6 +2431,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2429,7 +2481,7 @@ msgid ""
 "this subset guidance when answering questions in the 'create plan' wizard."
 msgstr ""
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr ""
 
@@ -2561,23 +2613,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr ""
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr ""
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr ""
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr ""
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr ""
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr ""
 
@@ -2752,42 +2804,42 @@ msgstr ""
 msgid "Notice:"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Select an organization from the list."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "My organization isn't listed"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2795,72 +2847,72 @@ msgstr ""
 "Unable to find a suitable template for the research organization and funder yo"
 "u selected."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr "Please select a research organization and funder to continue."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -2877,11 +2929,11 @@ msgid "Add Comment"
 msgstr ""
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3142,7 +3194,7 @@ msgstr ""
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3312,33 +3364,33 @@ msgstr ""
 msgid "Themed Guidance"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
 "ing their plan."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr ""
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr ""
 
@@ -3406,7 +3458,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3419,7 +3471,7 @@ msgstr ""
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3467,7 +3519,7 @@ msgstr ""
 msgid "Template details"
 msgstr ""
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr ""
 
@@ -3812,7 +3864,7 @@ msgid "Homepage"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr ""
 
@@ -3854,7 +3906,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3863,7 +3915,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -3872,21 +3924,21 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr ""
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -3987,14 +4039,14 @@ msgstr ""
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr ""
 
@@ -4210,79 +4262,79 @@ msgstr ""
 msgid "Instructions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "supplementary section(s) not requested by funding organization"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -4835,39 +4887,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -4937,7 +4989,7 @@ msgid "Filter plans"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr ""
 
@@ -4946,45 +4998,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr ""
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5028,15 +5076,15 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
@@ -5694,6 +5742,11 @@ msgstr ""
 msgid "First, search for a user by email, then select them from the list."
 msgstr ""
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo
index a7cbfe93762ce13064c75b797757d982d118194f..d47919515db8e1a82363ae37f6a98bde4ee72f8d 100644
GIT binary patch
delta 26308
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
Qitb3&F>&WBxgRF^e|_%RBme*a

delta 25954
zcmYk^1$Y%lqsH+)2X_q`AVCr|I3aj&x8iOAf<uCp4^D9{THLj`6bbGWihGL|Ev|(E
zMSB15&Tt?0x!d2&?Cki=IXUfj|DKaz>&yhcn<-;Yceqx?b{v1~ki&6G$90^w)s^Zv
zi`qNRV2|T0##xvp!f}$4zP+R4WW=MG9PeUpp1;A_#5;C&oV4gfn&;`zk7zDTiDj{h
z<M^EV1d5U{2Q%PVq%F=9%!Ds7GbZigIH8yi)qn_0h0%Bd$KZGx(4ed1lp%hro8u(J
zEZrSvD(1#ta1XA=UOgNq9`!pJdzu2XVR{}E!UR|olVKxVgdH&j#_MHzk{;EQ{5D=5
zYY}gP)o=wa!Izi_r}Z`?vJle|kHHw~cg_+hhGY6TPB`vERqTl}6{f%v#Is>`Y=z8{
zGaRSlD*O>kMLSM$JdO;l6RWS|JjWUs+e;b!Oh?NOaGb=X*G69&0?i4i!ak@u8;03%
z4r<Q!qSnSm)Cj%8!kB0vm0(%a`xQ`A`5l(Rv8aapikiBl-<u9p#t`CNzi0f15|~3m
ze8$Ls5WOOvW0d3U$5p5vbQx`iwCNbf`9gdt7RM!H9j7v0!?KuloM~t~R0Dh%gu5{q
z@8TLvG~T4gjA#6naFYZTFm8fbY{xMt@kf{tQ!>7ZFcT`C%UT4}5ie_Pf*RW17zc-7
zdK_WX7hqE2YixX{kAQ~!D8|J<F&_S9<IhnQzeT<1nP}ETa#TfGt@&+wDO7p2ZM-8U
zCq4i*m1FTJE<|<E*J+aDBq1;vBXI#1!T6I+dTCUTYhVg&ge9>vYB4TDt)bsAH{L?^
zJkb<0k|{71@dBs@RKx<<4C$E98BahBn2AYoxs7i@_3$97VP}wOcfwfmd6bSye{SPV
zrkTYz0t=D86SbS3VR_8|6YpXl)NWdf?*4y3KtucjH3c704f0NB6fimJd3tLOOhCLK
z`e8}b8mNawIe@w#gXk=pVcsh+)9j8?sHv@qeX#+CY5yN5pdpPt%k-cest5hBJFdcf
zn0B_=9hFdv^*3yZ3FbHsbvd0-4gZ2^G4Wh;KxIdzhhj3Ugc|9F=o?9(0|Cw5W9)=}
z^T>pQQAhD1)W{q|ZPzoH9P7<zOJO_I^U4bxr$5$0m3IVF;!A6+g^rV&cp5B?c@{GN
z4GBb&&;j>hZOp#NaT;S3>V*@iMR*Id;u8$Pq>GtXER9+d-EkPsMt}5QVhlqqx<;s}
z8;u%~DNB52wJsz<bG;lBdK_mxYOZ!HHR%U174hRXeiPNh2iOl&E;ISZqFXR(@h(I)
ze63B7!R*A3*!0If0?POnW21MuX<<CfOgsgu;sTfkD`F39j`i_4roc=qOuqb>fp`Vf
z8fb-j-VfEVF*ZH}lM?r>B#@Or4C+9*idrPGe&(YSQ=wLWVN^rQVmhpe@h}3_!|tf(
z1F$%bM2+ZP)Q}%V<vWL36W5V7<a1sSP|uu|X0FnrdR_$e;&-S9wZuT|j><m?)q@qN
zo^8b(cnDR&BUFPvp*oOYmC+C55f8+q)bHdXpaP0xT&#?Gu@-9aHN%|P6Eoo~RDs)2
z4LXR*e-BmgD~yjHFc*4Pn@`icsPww1DQ$}7so&{NKm~5Z0Njly@CN3_RclNGFJf8Z
zcTfdoU28@n4-Oz+9@UUt=!eHpBXko7;xp7*=(NtH4@6%a62=hF8kmS$gqtuiZbS9_
z5Nb%DqFVkRCd5?hjhRvTbD<VrG1N%b!$jBw1F!?CoRQX9>luFy@fs3T@P1T7E}|CS
zJ5)hwH<)dj8IustZY_k`=jBihYKbSXGqS9lA{#kF@H+0tx|_@truc==2jcmEVf=Lx
zJtjemC+B8UVQth<HN>RY$=VOq;E|{b=b+wOjvBcWsKt5Kra!<S;z_och897MKt0rm
zb?^}=NT4@rF)c++$q`fqC-6L8w((V4&8OKGRE6&_JAT3t4BTdp=DO%dye(=3`(rx~
zUr22Hc8qC&?;!y#rnjh`enD-&B-_ol%Zuz&rxa@FYoQ8kj$Uks=`aG7ZwP7)OhWZ=
zwKWD)6F-c~cLgcW=R78$ir=Fe5^sk&xss#Ob7CqCMLtKI8mNXmMvc^aRD-^t^2cFf
z(_m^$i+L~|RzQ{00yPD_+&J?;oPg$fCTd7mVKQ8gYS3P6k4I5cl4qCM=fzO@%b@aA
zK=rsLYGj()=PgjXpe+u??pO_9U`^_G!glk04@coNW!PiB2YB|<Bjzj=OORf9pZNo0
zC`J-LgAo|E-+V7vh-zrI18im98;x~{r#a*}-LNB;!3(IVNO_p?S5JcpWLHI~mbN%z
zhPX4PC*BX$v&pDMH6Jykn{E0@)X-i*P0ceK|A-pdWWO2%QA1xCRZit!nSU*Y79{A!
z?wAJ$p<4JePQ=})2GlreY=Ro{2-FnxK+Sy=s+?ig$<_tdwU~hCJ5l8wKI${8@tn<Y
z2Q?xuQFHAaGcP1Uz2JwcFe}EvV2p?PPz4voFf5DNa3EH~`KbJNu{b_LjdWJuZ>FLU
zj7vfoX2x=;5onESP&8)25ttE|p+;^$YPFw3HRK@{#g}*ngN`%0_z$YW?@pL0ZH?L;
zzJUZ(&=f3yOHdVDK(+V<YG~i0<~a6AGsNjo`GZguH%7O?s5y>CRWKSgB@0pIt-}Pk
z8T)Gg?;)^&gu<sx56@#_;;&H!{f9c^Q=T>j<;PgWOQWVD993{-Oo}zF%~2ief+}y2
zbqs1mr@POY|K)CgPdl68C?+ApMO2UPpj!M7szQyc_IDiAl*GrRm=p71DC$Ej0=3=7
zU~W8$nu^z$6YHEs>URbZsEvzJJ${L*IMz8+aav4HJP@^Q3ZV+DiWx8p192j%fg4dh
z-iqqTK~w|J+Vnqd{3-fW@J9mL=ZVjoj6pb)cv1WrPvJ`Jd%-j$^F=e~`BCRUD5|2m
zs87>Ys41C;32}*a9Wv+6cGMJxTw?w;l!Y#tf{UVhSQ#|}El|6n7pkKEm<%VQDp-W-
zzzS4>F{qyJLcM<sQ{Z(>jn6S9#=30M(_Ci!^_?y!3Cd6zwVj%y()-x-$yk8+ax93K
zZF>CQ%~!Has1az1{W(dyqAI@ohxvZ+7S-U4S4_S@R6M_rKq3M~Q9~7unyZ=^ADd%#
z?0|ka7L|V?=EXIrHSh;&B>qMf9Q&%NC?RS@(qT!=fm$PNQ4REUB%l`up!V@t)M}rC
z>d{<OMXN9eUPd+WlYO4(nyDZ?W*|KXHC5rL-O&uypzl#5`~zxar<><KXEOn9mkXE?
z|3MX$^1A7HKGX~KQ3dwGAe@YPF9uuTRV<8QHyo!8c1KOwX?%eH;Rt+i(|m*K_NNvr
z^S^<BDt?A(F~Kd<gFp-;UII&CG?vB<SO=e>hOqQ)4jHV2)o>?jL}TAE4fI1zWpUI9
zhue5HOhf%neFE7q5>?=jsEi9S1b?<(#zMs7+~tcY7Duh}iKq&fpw`G{)GqlAwN|d6
zrt-e^Z&ZHIJ?3BAAteE2$blWOu#L~cX2e&ZwxQ>~DKI|nB%T`2;ThD(E&j{&cn504
zuA|mMTE<@;Du8NOanu^C`hfA*qNq=TR(~hVg?&&%HV@Uq<){~T*!XXlhWHIs#c%BM
z#1Bo+{81gshyGX+Rbdm<2)DEG=!cBIhGGZ_8mdY5!Ccf=ujQx$wmdTV&Y`x`9n>y(
zff|`FsQ2SMHWj2mm75JGQ%(^~Nc_kX^WIrhhyL^t(1*ke)C(a`O^?c=;*Bu@c1Bg$
z$EFWO6)+WZ;}Xn;r!X<T!#EiGnc43NQSoG`a{N#u;mb}yFBHS-SOH_>MAQq@P*X4)
z^Wr)jjaN|(YxkVL4ZM88L`~(YmnQ#S)X1F2BzOhm;R95|UtnhHcm5*~pM=b>Ov{4t
z6!BuX5o5nLE!~Rwi62Gv_#LW(tbd#QxljeaLp3zs8#ClZFbDCnSP&yHE>kiS=WG8j
zcxzT^sejCm#0@bg83$uwT!AX^DyGDE@5~5gK+S0uOoh2oBUT0zVMSB}>!L=WF>2@|
zQ13-!JnerUf%G^U^Wb7Vz*DHHxP)EsDmKST@6A46jH)mO)qp*ysXT{Tv^Oywend4S
z^#@aKMpQf-`tlLTO+Z7`1iRr748|u|08{;Iwp&FEA>JG{W#dpiorY@gLYw|GGPlk~
zOpa$zBXA2-;B%~n&PT>y8ESuIxUe;9XqKTC*9NSLJ5W9IeljDH%$gdNFFoqLY*-3I
zP`jZkYAUB=R@{r1@iywD-2R#I-$mf`XMXiyQH=Xyrl6GLaeLkwi}QRomc;Xz9g})I
zZo!4|Eb$gN1oL@4&Ny6)dM`AVd9N2{q5QR|4xNncalZ-q`QmuoGkrX&#e1<eKEz8{
zm8H5FGsp8d%!YFwE8xla9(T1TPvCLqG61uY9*pX74a|bkSO|YYt^T8^Dg9v6eYyF$
zvk3_;QLB6#R>r#+jkyzfoSC$IA*$lgB<A@bEK2+!rpEUeh)Fm$(_(%chE-5gbR5&;
zMXZC*k;U$F$|N&A?t-e|IF`kv$vy5|*2Xa6<544Y1hwd1pjQ7!)Z+7`@HmXFlK?vr
zPm<E(T*SVphEz}GaaQ3e)MD(Pn*7@TBMGRWv8Y8h3De*_)b`tqv2Z(TNOz;Q>2=hQ
z#`p6$ZLtJu*UZCGco?goCyg2MYFLE$_o$KBfLW>E`Hg_K)l<}glQFF+xDGZYJ`^>y
z*HA<L88s4x)0zA&QFA=S#t&mT;_p#Y8kXKH+K#A-$73d3jy|o@Lj+XdC)7{|WiWFZ
zf*FWcz%tkhwQc5O4cv^{&;MZpOp(z{O-9rR2HSWU)PYkSRen9xh&RpXG5f!@eb5Uv
zHv?>jQ8s-7YASxh_&6K2=$4=w6l3G3Pz}0+YQP(7B7f8Ktf<9V3U!n>@b{T*)QJS0
z&HYhF=_pi>=3qKphB{#Opb9vKQ}Gsd!Kh3g_q*Xu)FSrJ>~a6aWgAqF>#+HCA~r_7
z-w$<;O!N^rMqo1r<NpFY?(coea5wS(fga}`7Rl;y8e#fuW~zE&IpT9r4ZCLj3-u}Z
z3bklG{H~+j6bFC7O4t$KqZX;Jbq-VTJZwh7->3(*gUo6jkKx4kV>k2$n;!N=ZL7_w
zh84?c7V(d$-LV^6;6v<(m2!EU|0x}{Yr=9fLaaZhD*-L8W_dmC_xjnW2JA-_^ci(x
z<;rJz+zj<Kd@i=cD_Dtr9~xrP2j@3E-evuWI+{xs@VNgTa3^YtKI2gB|L}sQ0f$iA
z%Uj4CIK{C8@jj>uf5)2WSJ)i2?NHlp6sku%usc3ME!L(*%+$0(t)WQN)C@z7*i;PF
z{(nTEKL!>x9}2UvEAeE-%$yCvO2k7#J?`%W(Wp5+g!(XvRoskRO$;C&h0XCNEP*d^
z4CV<l=g1b!Nc=MT+7Wn7paC{4VYb(5)au`inu0y3A$x?yFkeYCLLE?_;|oxW?I~(s
zzeM%;AJleDR?6&xbf|a$YW3$T#s1fJs7->lUq{p~=!-!(A2no$Q3ugQRQ?yJg5s4n
zM|N`5Hp_&{p96I+6h$38HBeJh-^LrG^0zAO^SED?I+CD+XE^G}oPxP=FKT-|!bJE6
zRiIPG6c7&;PloD18dUxqm<<b{j_wAiBfcNz$K|LgzvLsJ7i*O@6|_K|V4X2Bevdkk
zMxzdpxu~A(L=E*mR0EEnzMz~$^*nw#)3MB`@=Bt1SuIq36HpEF%_X1@gFQCk8io@8
zjNw=`+~a;l>yKXIV^Bjk9@W5Ur~((Ej?@jPo*zVw#9yceze45v2i5R6<=qbZoJ0gv
zU|MSy)LaLndRE@1S3@nDdZ>!}q2_ulX2sd49_>ag-kYdZ{t#78><XryM5s@}RG3`*
zKOX_LunekY6;KCGH8%rOfCGt-M-5?|ie~XuMD?^5>cglvs+>`%28_4q(`|e;sv%oY
z9o~gawEqtg(81%+F{T3Qqk7U9HN*qaJ!r72hl2*UVU8*u=U2R5)#O`R-Rz!?s0RIk
zi+KJFmk^&=)9jvtwaf@sL!Y)&3j$hX(HMbaP>bm~ror5`&HfHYt(8isp>2=h=tIrz
z0aVY=;yb*GyJ*1qI_3bISkJ79i#Uzvf7WCFpCAxb-{YLdvfr7ZN!q{^m<Dx_<Ukc%
z1~unZ@d`FUt%X7jO+zc8I?@8wz+R{WY68~9tGEjDG%~yGQX`*v@iqy1;XUrh)Q!!D
z&?Qs>DVvyz+E}AdJs*WS5sz8_!@0zZHTAgv72J6&PrO?*GXfjXpAmVBgV|0geJ#v>
zo!rXwYz1nFx1r|nBC27JurS7HZJvi=4&se55C>xoT!=b~pP)wK1?saRRvYtWv;x*6
zJ|5L@-wgs<T&dfd4~r@|ocJ(2&yg3moyVC){7QF^a~%8h@Hj8AbWc-oNG}>lk9wd!
zw#W50A5urL3h^|3%(v!NSdRD*48eU!y*}qTflDL=Mwz4c9j+ywJ=%QxJ%{RHp1$TY
zp%&_3iAL=XAL?kHVB@n;=f`sEe*63yY7IR=jqoc>rv0C+pE=>OpcYpFREBb>ecB53
zVbc+{e|w@9T|d+ik45d0`IsEHppM)lsKxs`ssk@k4NKYI<j;pe+W!>^Ji@M692*WW
z6->mT#1~_A%r?-Z_dqptD5~NqSP5664zA}mJ<Ipzi%Bt5{?3>W2cWk73iPQ(dkJVU
zTtN+G@<C>3{ZT#2g<6ayP@j@@P+zH9;%vN*xv<~=JkB6og!$2bu$l9k)*rC}>8GvP
zhOqy&Xa)>1i)Slps9&QR@)0#>@qDJmDNu8t3)PS!sDr0GYAw`5?Uq)U1;5AkEY3N&
zocNa?Oul79%@l1K$^*^uArkuI3Dg;1VVG(8Fw~SB!chE#nvx>JO?(^9ApRVy;m8r@
zZ^1LTfOx@?X6VnNM*0@|<44rUrt^(5bD9hFxm^n9VSUt;yuj%gG}?SU-;G*?X~&q6
z%8ZkV2cxEFJ0_vWr|k1<V?9n!((j?xNP}@^(au4w9p8EzID!>OxQ>l5V7&SJzdyDj
z{uCQyjS1$9$WqjzI*2*(JnE$Th?>$eKbrGo5UwM>4fXNeVWRnv8jBoEK4%jF&Dkr|
zc1kkI^e_-Lw>hx_Jqkt5{h-NaZHz(<=~UDjS%>-*jlr?_47HZ}Pcd`-18Un&MXjyn
zZaVvK6M+&W974VD1yympspk7Y8q^E^7=$@dLtO{8jXGdo{2#W&*QotpcbciN9R?8Z
zi&~U3P#xWdNvPjBZWI1MRrC}C@jaHq3_qEInxlH$1GW0cqE`J()S_C3S{nyYBXSJY
z<MUV!@1r^xG~JA3e)MTbOAt_xDxnH&hN`F&X2oHsxm#|ZA4m6O!(h^1qVlJkVJa?+
z8o|<75No0uG6c2grr7w(8SH;$+(m+VejK$6E~AF<DXK?bP(6+_(-e>j!-(fbExrz@
zhX06~qB*Dv51@K{5j7$=FdsfZ9Z-I=*#F8<X_hItHdZAbff||hm>YNCA-spGaOG^%
z!*f`U_$^cgfpbg;^59_N;iwMoLyhoh)V{xqn))|B0_th>T+`xFs0Pi(BDe%K0>7h1
z;3n!IdWstI?DNc2ltsmxphhwZmEVT}_#^6|TW{01q1Kr1FafRNzpP&{J@GX2O?m-T
zkE>!f?2T&Bbkr)Ihbm|zYIUE-LiidrB{>#&ocmY^2VlB|X17eiGur?07MVHw9XFBT
z3)aDni_PM3mY50)q2@FUHIy~2ZBge(KhzXV#R51F)zDL@IlqW`(Yw@qSmnp;nuMkV
z)RQ5oxtWR;aVct%JVXs$x@BfA1Mm~^{HO}@E;pZQg;DV_sLzl|sHr-Q8kx8&Og%xU
z@=D+c)}K?JfadJz&t@(!poZ=#YHB`UW=yft^soTB+ZNqzi>kO8da*4ke+Sh2!%^qM
zTvP|QqqgC1=+lE+1T=)7QHwGCDq|juL%cL9Uj@|mY=fHfe)tQ{LY)USR+~RyI#?r7
z9qEC3ZxFis-@0-&`(Jaqj|5eG9u>cbYUw*v1LChS2Tf8;M!XnCVrA4S--y~Zdr>2C
z6jk17)S9@38kxtaa-X5f`Lc%bA4VYQT94BPr(g?wjUTbjI`es7W4-yddkRZ4Wl1)e
z?*%nBns2!yuoL-DVtXvI$^7Ip3sqj=FZ_(hdqYqk!|k_toIbe9N1!qR|E*@O+M`-H
z2pjXl1k@1T+h%(D3N;n~*|>j<8PeRS{U44xa9W_|zALJy!%<T-4V7;#YRY{_3FzDI
zU8`riSyWk2Ls$fL0#-&9*c(^jSkzP%-eIha8v3TF)!hd5erHsNzPFCI&NKR)bp+hG
zLoJS@s26WqU)pr<PBQ}OQF9uM%3sjNtD@FQeN=f(P!+dDZO1;SgKQJl#H*M@`#*S>
zIm3&hhPoeWI}S$;<s{UQFF=jJE>y)AFc&_?yqJ2oNe{=Y#G9bD=^$)`qwsIMf!*-j
z9_pcfr_5e+KvYL<t1hVRG675A5)8r{sNV--?=wA1fND?%)KnD0f>;SP1^rRw_)v2{
z9d)#?M|JEN`eG6Ioq&e?8V<#0co2K;H=p~34w#-aMpe`fb6{W8;+l&Z`ZcIEu*t@^
zqsrZDJ&QVN@1Pp+&jI$o3W#&iWb{L22u4*@5;YaIQTdvoJ3^?Toq(F_nW+7}2zBx;
zMfLa~>QnR@YD$tHGQR^9#t`Bo4*ATd(q@~G_pte5(Ht9-VLEENJVVWS{3E8~EU1R&
zMpaY>wFVla8aM(~!3xw=TtY3z8>lIHj_Ocs->+s>r$(*ntf(_RFKT~=qh4%@8?XoN
z!^}tdX$5bhMrzJ6Q_ecncHV^=;wxAiAEKrx^f!~QwAELGz-S&cMXiO~sG+=%TJ;aD
zagLjoXGQg>IO<ca9IC->P!;q=jnp7ic~enG^bFKUF0<}K7NgI(N<c&M#+vYiS#$xY
zf+}G)Y=Nrq2h=KFgrT?-i{oolgY%p;U*W2vMqmnF^pGF*yzgnVCZ=L+?f;_$G=wKn
zi|tQTgPx!o;5lQ`)1i8p9ktDJqn@`wEy5_&7mfd+*1&4i8aavDwzq8jK5E21U}fre
zlAbjg8lqNjGt@ye5H)0@Pz5bU&FxkU!waYbD9Jg~fl$<1sgCM-b5#B=sC;9vDE@-l
zrVr7lp1vTU7RNbnDhx(_-!G2=*a@|L#$X{_gF2XQVo6MY!Awy@3?@Dhqj5267o}nR
zTVoH@l%2-c821wUU#s}TCG&II*30Ioe1`#~*Z$qiSx;00CSXn6fVJ=w7Q^a)m|wMq
zqSnR*jKpVH2^(KABRC&50-I3h$Ac^Ef1OaTNzfd|zG~()32FqgqYA8sTJ`NQKXyg+
zWG-qgT)^fS=bAZ^+oI-pAZiLHqDFcZYKr!uru3|jfHK~*en4eRdflXF$C1RtPz~LO
z9q}Bh!NqTw?G=s}iPu4ohlbxYYboeYGxwFS2G4t<cF``>`@U-g)S`Q+1L!TPLI0r^
zVd`7v>vSOMh5D$LH@Egg^>8?*#Rb-FsNHcI)uH>SazCQBVe;E<eLg220TmdEIw)$O
zUTlhLSTEFE4aI`=YyxU6?7d@-(A%hjU!hig+`DFV`=Pe8KdPLZsBIpG90g8I_c{A7
z{e9Db9M&+bPsUoPmM_9U+-Bo{pbCDD>iNH@A@%#qtd*izg?Js*c`y^zup_87bP;uq
zT$j}E+##TrJwy%7N7P)WdtiQ!&y9L<GHTz>LXFr$EQFi!EdGU>vY3Y+=P+mZVbn;D
zePTYO7NMqi2P)qo^l47d642aT!C-ua%9#GC8QN_4hIny2fcc)8k$HhdiN|?vc0ozh
zRCULzH~>}dcQ4El-4!(z%P<#ieZl@OLf}slGBPKrUz#tM1zwpUzly5h6KbCqdTkDz
zNX$!oIqHNvj~bbms401env#@%n~oGhRa^?yz*?vgZ1T6y^spNV8j_)?5t)cOif5u4
zxD7QTPf%0w7W?C8tcQKyn7KcSdjB>C;A2$9iQbw9`J>WHp&H!MM?fDA9c)4*h7j+C
zTICC|EgnSoK>EiVJk>Ce^r5JsT#Bmr6sl*JZTvB+qQ5Z@{)?KDpm%0%_{tDaLPKnZ
z-BI6Yj$uu_jp}j8doy&!Pz?%4^=v7sf-R_3y$dx`2T((O0_);sEP=rv%$M1A$j7?R
z8B5>^57wbp>+FBchr>q9!YW?+(X{-~XY;xK0<|WJe=%#K2fAwkH4^91;r~A2Wa6Ly
zGfw1dO?l#3JjQm|jrHd&w+Sg@dEI}{*AP{~8Pt%)iS2cJTo4}<pN9I-8WP9rWTT=I
zalP(;j@v4p*X_U-)JU8_P2oAriEl6?W{U51KSRQ>nD&1pfeN??)xvw&6oV6Z-LKh0
zu^RE8aR$D^GgLe#q1QcVnk4qRpN5N2=fQK-NCqbHx*tx(QB&Fl*Wqx~)D%qWHUIvv
z6oCdLG(dftt-@%$hPAP7GSk3?Sd#c%48<(Tz3xvfjZp{I7}Q#sgIbJBFe?pRg9C`4
zPT_SPVwIF$_kY$?AeGnW>?dJgDzAG){*c<dI0-d`vrs)*fLi@qQ59T8eYw1Yf%q5d
zsEzOEb-xQ1!${&iu>fAdDwr^h*Zn?FAJu_bX?&(fXGzcyB~I&gPrw{ln0PHz#-Y|7
z*pK)tEQOuZ8JDBh${j3=Nz)r^V`<_OQ6qU0HG&y4m<BiY5zv`G5_MuNK^1TiRiHPc
z*Zr^wK^;gXQ2CmorfeYU3(9G1f)CLT!~M;BjZst49<|N8q5kj~ff`}oPXrPXn1dS9
z6_^@Vqh8#H`fxgC<JYYBQ2C$P_$$=W`!A|PewoZ_FJ!HaO7CJFjZB%(Sw<iS56+{e
z;63UDOOe^keGXKQN}&#x`lvZ?fok{=RKer$6#k4OurG&4CHxl~Vz~f%%wn8@TK)3^
zy-t9>|Nl%tLwF2>@D7sfB*<#kz*yA2--EkxWj3!9n}Q;;d)>e5yW}uy<^XD~Ji;Ux
z7-Y<k8uHSp5vzq-1NCsLD*BN?3#<_Ab;5BGw!u5tP3bwk?k^Y{F^u>NRL^qd@;be-
zC%Q*9>ck7l?KS^vdelLdJ&)HtA)8@+;-gXL$W`<$B+xrAClRK|=XF9ja;st);{EfR
z?XwNb5`Tc&X2Au_;%ta&@KDq$KZH8CJO#bZSVpKhs-gD_d7W~Yr?A)kWwjelB)+LI
z`@brIaz(tZWAS_9=dljfDr$ymKB_@iupOo=W>)(k>`we524eY8)6)*94o$(%cns;6
zQ?R&M)J0IcsdRDnzZOvo5;O&!Q77OL)X=`eo){TsrsN9VCSIb1nS1||W*bIfWzvsf
zMNC%899Rud4I79Za4u@@ozh<S|3^eAAAtbkC#}!$2jWS~m=B#vs1xrMYCC>F_gpAz
zj^q$jPy3+O#wx6ZcTw*ZEN6C27;0NrK&}2JsOP@+HbYkoCZR8;!TG4|xCJ$br%-d8
zD%|XrdYF}XSImeLQLBD6CdKWjijJbrkMpQ}_fZvl%DV@U&q-hcPBPRN2|rZ9{+Jxg
zqE>NT)Ti4hRKYt?Q+F8k-dWW7@VkxQM)mk1s$ri|<s_<LrX(DTXrs3$pn_-NAUuJ7
zSf!$Ac}vv(?S<;u52z8EggJ2q#>O+&i>QWNL5<j5)BzP($&7FrRKq%Axc2`b0;*sS
zs^_PyFHr|ls>)`LOJF$h-l(bBj2=9R8q(9Ko?gbpcn_8D6=uVPRZPARRD+A5`@jDw
zNkBtb8}(vCRDtbmdKb(@yf<nQPO{Fz?8FzN=J;3C(R~F&@EK-7|Ei|kQmB!rhN`b)
zRrbFE-ATxc(Wn;|qZ)7kRpD=_Rel~-QG#k-_dg)=$Lhp4qRRP*LFlb+KJ9X$(!)_x
zSJkFBMy;Km)qUo{Ae%4_BX}?atKuirP*tkob-!FzM=i=|%#R~cQ}CA#b}lbwvf&Om
z*d#j(IepfWF$Zby?DKhgQS(2Jhi~vG3C#%~;MSMe_x9!F#MdjYeNo9LNz;{y)@{J8
zJWI?yne>|~nCnNvAv~YKJ?EQu%~R?np!yyD`f`8MPpYnRCB{>{P}LUnD`_3L8{0xM
zkj@`A?*ALDY^3Q#n`qzFw8bW^n~m!ucdiZd$o&GEjOWpW<LHBSIju}chHfP6CCneO
zPERs4<kmHv`v=lmaesU9S>${n&o7u8N80D92w$}CUbB9E?>pjksH-9g3CZt%&`&4v
zGzncuDE`e0>4}dZo(%a_#=Vvi-(rI9Kg)m9vz_Gmp2mdRycx;cP4AO)g?;A=&vgyt
z<~(vDH2za;;wv)W;NC$2eMtMA@M-kJ@#I^JBW;Db$@AI1*UK7>r^u&k1J4_f|00g!
zop$!U?WCpVo=M&TJagy284va8SDOcoN$iI|5Z71dIXvq@W_}WII$$H>{<w)e5u`mP
zJQGJ@V$^lnn$!B)B)k79PHECIQiiTc8vpVX^p2Nx@n^ep4KLv)`?C9he@r31guFlF
z@~;KhJOzkP=2<ZDFq>ABv~{-Jj+mSH&)j2po{PMXD09E*Kc9BC7JnZ8L%0ta0|*}^
zqpsoH{4w<ZSACwR<*sR;cO@LxhHDY7MfkYQeTZ^elcp;jWwiRHoN1gt?g2BEO#A@u
zUbhTRJ^Rvi3M)riKH_D$R}#NX-Y%rwBHWKO{#bS|9n<=9s_QTA?|D{;_#Im*UkjWW
z+}TNwN4oC>5k4Q>YY>SXc+O1|b^qxlevwdHp3TI^RQT=n)V@2P=eqbw$i3q7&w@5>
z0q+bo$<9vl547*R*8KBtSe-veNJZvbgtvWDL7Z>GZ785EcNX&XB%iKn2KS$R$s5hH
zAGq(6vffrwgRnlPbMX#8B{+OlbQ+MSCbo{{u7CG^X8?)k$dKN?SjtxN9|dRT&P03!
zc~WzKy%v+!h+Cf(N4{z72jcCCpW)u~H8Xx9ZwlT|fE|gK@e$!qJtrLr8SyN4N5WNj
zaRK2+++VLg1Zt3<Z({C$WZHyq3+~#)b09yAIIDTDCLSQ~6K;Kx`Fj0EzI;TEaO<a@
zf4O~~NW4RU-yEG&+(Wr_ou;5cHf&PZ8N^$XUsnVbCLvFI;`&~vYd803;&W}Dt!^q)
zLOy+))^*=L+hWT0IZG+%7h6$xGQ=US>mM>6=B`5gIRy;i{+skhr18bb`IWe?0(gx0
zQSLtpUqxNJDU-i5oG;vE2{)yj0B(Qsq~$*1)>)PpiR>rSG7?_lQ(ivIJ($cTc$SPb
zeXIF;H7Brzw30jvopzvJTHgg?Q^@_46kUOo6q~rda;$Qz;anx$iRT;fKkm!CQwYCa
z<9Qa&U5vYpedp`5^`ym+zaa@zDYqi=)Wmfy*8hgB5D9OIJm+pjhWI=@K-vlA;CfA1
zS9J<bM>vG%sR$n;oB|UPpGP<;_gLQVMc%=LlXK@HT!B3NjOJb~(fvz<e7ctC3>`!u
zKbhm(#IM^b6$RJgSz(@i$Fs$R>kwW_`Z#RKJ%MmN3hl-7ON6VFrt3Os4~btTp2enB
zB~Mn;zP+kx4^1R7KQ1KWWM1sgJ)g8D#NXovTxQ?O&$B(GHRSdqJQ#IFS$k5>8RFA<
zrb~Z$>PpP>FPMnu@oe7j(ASs5#v~@?g|mbM?L&gjO)9Q~!+72j({m>vtm|j)g1l3K
zJi0uD`(q7Ugr#jcNr?C6{(AjQ{`%arxa;Z+O+taA$q<Jet$FDX_Z7mSq@T5g>*b-O
zFC%RXVL!s>dB!i;?iH7KHNtVZ6X_YLUC8?pV@NB(ot<0PB0R{QfPDN3sDChr6jp$Q
z3wWFOKKCIlq>xG6y1uuK>5RR&Cz6((eEM>)Yah4A=283{cV#MCM_L2&d8bYJE|sr0
zp<hU8@lDPj$ytS*5A+&WF~Xg2Eq8xg`z_m|8>G$V&P)8hEu$OZA9*J~>AFU9-zR<)
z`J>;xGLW~3#(N6^evo(gYu_nO;r9q%CrcD}XVSKDk0wuPTXAuoe|vpLBo@z3*vk30
z5bpo)+BG<rw4OF|Uc#+Ot7RLY<Px#jT;G$ZA4+sxwuM|I(=g(FcvgnAQP|u*8%+2&
zZe3AS{404!5dO;+97(u=eZHS}n%eLr(lZkNOxjReR(5UfEcQi$?#~9Yv+Zpj`|>YJ
z<T^**4y5rbkozOa2U}2T(mvU8Mw0g8n=;pY6IL1hi5I5){}FZ%mtnjR#$B64{ymrb
zgH|~#$sLQ#`enW!x2|;L*=P%#Vk<XK*n>8{ggi~i|A_}B34bJ=e|_ct|2BBbyP3Jm
zk>=<AHv?q4OF|$C^Y9h%7{W~m*WslVgmtYa+=Ieq5-&<P0RJF8im<N#5%0>KmiMM}
z>k1~m9gpKu?vvadxo6pTe&TOtry!Z1bKlU5RIrl_4|%DX%`}MgS)_NzB0L*|Nw_<Z
zHkA8k!n)>g4<W8A0r`e=pP-C1s4E4g=blK~0^;43SL2_V+e0L+t#E}cgk<;nhnM_G
zONi0jQQSdPn#)$)L%B%Pb;_n~z<9iqg|sD<y9-z2N76gl@-GngZ6{$PFQ2zB<|DBs
z8Sbexu7-p&a1S8dg?wjto)s?>kB1@HgR~snU$4hD&`^1~<C8ClwBK#|PRv7n3+?)I
zW>dj#GIb_%Y#wC67i7AM%SlhfeUk7GJbO#HEB58q^}wp|Jj(fctsp(vKI_Z7V{Q0f
z-rq#{BpGYz-&qYIP?UteyquNrX)@>dS_)R;g=3_xBu@*}wS%y(%{<f9p8KjBGXDtY
z`C*>@i>*n@OWEVOf3okVAuXlC)bC!u6B$D01vtzWt_S7KV`rs(aV7D_JRggj@etnN
z*?aB}#II24kE)1!E%6wh53%ot6E4ehUA4LOS?|_=-e%yxfpPYcVK*;sCtQ<Ey)cw`
zPSR&{KT-j_Sed&t;W9jrB>Wr6>9HVAKwWKk{s;F9y~8z^yt+E_JS+Dio&UN5i4@>r
zLc-OkY#j02m=YV1_KX7F@%%bz&A9UszsDWKb6tOu_U+Y)yeqhylKv-#lW!V+d)0B@
zq5gE=q;|ELGTVZu^6Ymqb|?L_%{LjF6EBM|dA5ykRcvS9y-9cijVnU@7<sN>8Pf9D
zGUMBFT-5&x+$qSQD*}JxWnCo*4<!5_rZ7qW|IdXKwwGs%u?ElE60T$$u*g=li*#Mf
zNe|_D1b0u;-kD_gS36%}9#-bTQW78HFk47ntMc}yz<C(Lb6tgqKOmf%a9ax8N8akB
zttQ;r&B2#K`~Dl!E|K>je!cW1Cnag+`EMrNv^KWI!^xDKlvViB=Dtfod&vANwj=$Z
zP4^MjRhRn}&+_7M>|)dPY(DW_ygQLQo2_FE;rgWS<@q@6|F73r5~uO-+iL*vb~bJC
zHwCXD?KXE)GS}w4Io!IklXk#{70<yt&u}=Ek0<<|=R1h^BV3ShMfD;v3FXM}fft_<
zug5)-`zO*@k!gl4uq}=vZ5hu7l0Pr;Cp<4rS|Ilwn=gRpg^8CU&sd)83gKBE!h0q0
z{WzNEzNG|?@Ina^t6)+5(Z1v*!vvmJB5fOYUDB)Laq_L?*#*M7W)atQm*@2fSFrIk
zygQkEx++@h6OJTba-QY<y8la&keP%x_y}L(*Xw__u&;61gXcjuPb1<pDSR`w<KD>o
zy240{wqa%MX2W_m+m<<BzgbKrl7z%X<f_C=69{j%ng1l5hO|38n}*Ieg&ZbajijQs
zAp<BUE%6HEi$&T%o3{<=bGS#5_CKCwBdjYv&qr$g)pMiFHyMhm60RcF;wI|cvoDRY
z=_ze|ihV9NaTh1uAA74ZDtJPC0q;yDuB$!aYJ`*9a@_Tw$rh#zFKw$AVm{LEl9r8o
z5-%<JCSO(Jx~`EHMBYERo7%J;SkacFJpH&w*!UX4X;h9W%dOx2AH@Zb_Lxk6^B@<k
zD@D8rcQXpxN?I|}lG#=_x6UU28B>t+$yUxQ&N;$0xS#Son7omA%s!vRbB}$ePpmq8
zrV~j(;tZQ1l+29?-zGf+>5(>bE7G>|Ojl0ZfLO%)lYWV`xTG!DZy31}*<8DD1aEgI
zM@n+!<{m`&JJOpFuCh6z!|+7YKJ=_Qt$wf9Gv74ww3xP`_tVYG`m`#%Ir)mDu~W8f
z-##KL%Bk2kx@|z;Ufp`O?XbD_>Rw@+f4>{<*<9d$NWqxaX*|<12epd`h>GmgBcek<
zWRHO8o&kNMA_Ag2M@9v7?AxP#bY#ySZM#KA4~)5A#8W+COlVn8y7-9-6v<a0G@xL?
z5`{u%Hml;v^fjR{2{FT}cz#VXvuQ(5rJ02udQ!$5Xz0oAiJ^gwJTc!j@f0W-Gj*D0
zdhD5HXL$l+2F~*MD#Rqe?rGzhnZKIXFJ|!#Pmiz!gChF$>DebDYVgc@X}wuuLeqMa
zXU$tNf~H3Hh-@F(wogD*L{#LV%{>Bowe3UqqDYB|qN8fF(qk%zdCMh=nOM<#KmPv#
DB>Zz4

diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index 1f0af80a00..ab5c1a6584 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -137,8 +137,8 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Necesita iniciar sesión o registrarse para continuar."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "No se puede %{action} el %{object}. {errores}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "No se puede %{action} el %{object}. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
@@ -237,19 +237,15 @@ msgstr "El espacio_búsqueda no responde a cada uno"
 msgid "The search space does not have elements associated"
 msgstr "El espacio de búsqueda no tiene elementos asociados."
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Debe iniciar sesión para usar esta función"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Error en la verificación del captcha, por favor vuelva a intentarlo."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "El correo electrónico de contacto fue enviado con éxito."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "No se puede enviar su solicitud"
 
@@ -265,37 +261,37 @@ msgid "added"
 msgstr "Adicional"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "Guardado"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -304,7 +300,7 @@ msgstr "Guardar"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -312,7 +308,7 @@ msgstr "remoto"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -335,14 +331,14 @@ msgstr "No se puede enviar su solicitud de comentarios en este momento."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Se produjo un error al solicitar comentarios para este plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -351,14 +347,14 @@ msgstr "Se produjo un error al solicitar comentarios para este plan."
 msgid "created"
 msgstr "creado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -367,61 +363,61 @@ msgstr "creado"
 msgid "create"
 msgstr "Crear"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Su grupo de orientación ha sido publicado y ahora está disponible para los usu"
 "arios."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "Publicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Su grupo de orientación ya no se publica y no estará disponible para los usuar"
 "ios."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "Despublicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "Suprimido"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "Borrar"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Su guía ha sido publicada y ahora está disponible para los usuarios."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Su guía ya no se publica y no estará disponible para los usuarios."
 
@@ -451,19 +447,19 @@ msgstr "No se puede crear una nueva versión de esta plantilla.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "Actualizado"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -555,7 +551,7 @@ msgid "Unable to delete this version of the template."
 msgstr "No se puede eliminar esta versión de la plantilla."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "Dupdo"
 
@@ -591,35 +587,35 @@ msgstr "Plantillas propias"
 msgid "Customizable Templates"
 msgstr "Plantillas personalizables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Error al analizar los enlaces para un %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 "Plantilla creada utilizando el servicio %{application_name}. Última modificaci"
 "ón %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "No se puede descargar la plantilla DMP en este momento."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "No hay organizaciones actualmente registradas."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Por favor elige una organización"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Su organización no parece estar correctamente configurada."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Creado usando %{application_name}. Última modificación %{date}"
 
@@ -656,11 +652,11 @@ msgstr "Este plan se basa en el"
 msgid "template with customisations by the"
 msgstr "plantilla con personalizaciones por el"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "copiado"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -668,23 +664,23 @@ msgstr ""
 "No se puede cambiar el estado del plan ya que se necesita al menos el porcenta"
 "je %{percentage} respondido"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "No se puede encontrar la identificación del plan %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Tu proyecto es ahora una prueba."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Tu proyecto ya no es una prueba."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "No se puede cambiar el estado de prueba del plan"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "No hay plan asociado con id %{<id}> s"
 
@@ -957,27 +953,27 @@ msgstr "Su cuenta se ha vinculado con éxito a %{scheme}."
 msgid "Unable to link your account to %{scheme}."
 msgstr "No se puede vincular su cuenta a %{scheme}."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "Con éxito la cuenta de %{action} %{username}."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "activado"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "Desactivado"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "No se puede %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "Activar"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "Desactivar"
 
@@ -1033,7 +1029,7 @@ msgid "Creators:"
 msgstr "Creadores:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1161,7 +1157,7 @@ msgid "Public"
 msgstr "Público"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Privado"
 
@@ -1174,7 +1170,7 @@ msgid "Public: anyone can view."
 msgstr "Público: cualquiera puede ver."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privado: restringido a mí y a las personas que invito."
 
@@ -1333,75 +1329,130 @@ msgstr "Pregunta"
 msgid "Answer"
 msgstr "responder"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Personalizado por:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Título:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Creadores:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Investigador principal:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Administrador de fechas:"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Administrador de Proyectos:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Contribuyente:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Afiliación:"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Modelo:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Conceder número:"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Resumen del proyecto:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Última modificación:"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Informacion registrada:"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1425,12 +1476,12 @@ msgstr ""
 "alguna con\n"
 "             tu proyecto o propuesta"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Sin respuesta"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "no puede estar en blanco"
 
@@ -1455,15 +1506,15 @@ msgstr "para 'Texto de la pregunta' no puede estar en blanco."
 msgid "You must specify at least one role."
 msgstr "Debe especificar al menos un rol."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "no puede estar en blanco."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "no puede estar en blanco si no se proporciona un correo electrónico."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "no puede estar en blanco si no se proporciona ningún nombre."
 
@@ -1496,11 +1547,11 @@ msgstr "ya asignado un valor"
 msgid "Feedback email message"
 msgstr "Mensaje de correo electrónico de comentarios"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "debe ser uno de los siguientes formatos: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "no puede ser más grande que 500KB"
 
@@ -1528,7 +1579,7 @@ msgstr "debe ser posterior a la fecha de inicio"
 msgid "guidance on"
 msgstr "orientación sobre"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "no puede ser menor que cero"
 
@@ -1566,51 +1617,51 @@ msgstr "Valores de formato desconocidos"
 msgid "Invalid maximum pages"
 msgstr "Número de páginas inválido"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "No se puede recuperar una plantilla histórica para modificarla."
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generar_copia! requiere un objetivo de organización"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Copia de %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generar_versión! requiere una plantilla publicada"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "personalizar requiere un objetivo de organización"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "personalizar requiere una plantilla de un financiador"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "No se puede publicar una plantilla publicada."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "No se puede publicar una versión histórica de esta plantilla."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "No puedes publicar una plantilla sin fases."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "No se puede publicar una plantilla sin secciones en una fase."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "No se puede publicar una plantilla sin preguntas en una sección."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Las condiciones en la plantilla se refieren al revés"
 
@@ -1773,11 +1824,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "debe ser después de %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Se espera una clave \"org\" para hash de enlaces"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Se espera un hash para enlaces."
@@ -1831,7 +1882,7 @@ msgstr "Por favor espere, los estándares se están cargando."
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1839,7 +1890,7 @@ msgstr "Por favor espere, los estándares se están cargando."
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1979,7 +2030,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2014,7 +2065,7 @@ msgid "Roles"
 msgstr "Roles"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2024,7 +2075,7 @@ msgstr "Roles"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2037,7 +2088,7 @@ msgid "Remove"
 msgstr "Borrar"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2501,6 +2552,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "¿Tienes una cuenta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2556,7 +2608,7 @@ msgstr ""
 "ces de seleccionar esta guía cuando respondan sus preguntas durante la creació"
 "n del plan."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (por ejemplo, escuela / departamento)"
 
@@ -2702,23 +2754,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Empezando:"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "primero"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Último"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "próximo"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Anterior"
 
@@ -2893,42 +2945,42 @@ msgstr "Error:"
 msgid "Notice:"
 msgstr "Darse cuenta:"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Este campo es requerido."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Seleccione una organización de la lista."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Mi organización no está en la lista"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "N / A"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Ocultar lista"
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Vea la lista completa de instituciones asociadas."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2936,29 +2988,29 @@ msgstr ""
 "No se puede encontrar una plantilla adecuada para la organización de investiga"
 "ción y el financiador que seleccionó."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 "Por favor seleccione una organización de investigación y financiador para cont"
 "inuar."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Cargando ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "No se puede cargar el contenido de la sección en este momento."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "No se puede cargar el contenido de la pregunta en este momento."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Se abre en una nueva ventana"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2968,45 +3020,45 @@ msgstr ""
 " abajo para navegar por las sugerencias. Use la tecla Intro para seleccionar u"
 "na sugerencia o la tecla Escape para cerrar las sugerencias."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "No hay resultados disponibles para su entrada."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Buscando ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr "- Introduzca un término de búsqueda %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr "Ningún resultado coincidió con sus criterios de filtro."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr "%{topic} búsqueda"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Aplicar filtro(s)"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Seleccione"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Haga clic para seleccionar %{item_name}"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Haga clic para eliminar %{item_name}"
 
@@ -3023,11 +3075,11 @@ msgid "Add Comment"
 msgstr "Agregar comentario"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3298,7 +3350,7 @@ msgstr "Escribe"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3481,7 +3533,7 @@ msgstr "No hay temas seleccionados"
 msgid "Themed Guidance"
 msgstr "Orientación temática"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3489,7 +3541,7 @@ msgstr ""
 "Haga clic en los enlaces de abajo para ver la guía de la organización\n"
 "                        Relacionados con los temas asociados a esta pregunta."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3499,7 +3551,7 @@ msgstr ""
 "            Los usuarios luego tienen la capacidad de ocultar / mostrar la guí"
 "a al editar su plan."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3507,14 +3559,14 @@ msgstr ""
 "No hay orientación organizacional relacionada con los temas asociados con esta"
 " pregunta."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "anotaciones"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Ninguno proporcionado"
 
@@ -3590,7 +3642,7 @@ msgstr "Estado"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3603,7 +3655,7 @@ msgstr "Publicado"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3653,7 +3705,7 @@ msgstr "Agregue enlaces a los planes de muestra si los proporciona el financiado
 msgid "Template details"
 msgstr "Detalles de la plantilla"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Añadir nueva fase"
 
@@ -4020,7 +4072,7 @@ msgid "Homepage"
 msgstr "Página principal"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "contacto"
 
@@ -4066,7 +4118,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Subconjunto opcional"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4075,7 +4127,7 @@ msgstr "Subconjunto opcional"
 msgid "No"
 msgstr "No"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4084,21 +4136,21 @@ msgstr "No"
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Despublicar"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Publicar"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4211,14 +4263,14 @@ msgstr "descargar"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "desconocido"
 
@@ -4455,79 +4507,79 @@ msgstr "Comentarios y orientación"
 msgid "Instructions"
 msgstr "Instrucciones"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Formato"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Descargar ajustes"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Seleccione la fase para descargar"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Componentes opcionales del plan"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "detalles del proyecto portada"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "texto de la pregunta y encabezados de sección"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "preguntas sin respuesta"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr "resultados de la investigación"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "Secciones complementarias no solicitadas por la organización financiadora"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "Formato PDF"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Fuente"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Margen (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Estilo"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Superior"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Inferior"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Izquierdo"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Derecho"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5134,39 +5186,39 @@ msgstr "- Seleccione un área temática -"
 msgid "- Select a repository type -"
 msgstr "- Seleccione un tipo de repositorio -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr "Haga clic para ver los repositorios relacionados con %{subject}"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Más información"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr "URL del repositorio"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Acceso a los datos"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr "Tipo de identificador persistente"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Carga de datos"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "tipo de proveedor"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr "Tipo de repositorio"
 
@@ -5236,7 +5288,7 @@ msgid "Filter plans"
 msgstr "Filtro de planes"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Pregunta no respondida."
 
@@ -5245,45 +5297,41 @@ msgid "Plan Overview"
 msgstr "Descripción general del plan"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "Un plan de manejo de datos creado usando %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Título:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Afiliación:"
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Administrador de datos:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Financiador:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "IDD DE ORCID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "IDENTIFICACIÓN:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Fecha de inicio:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Fecha final:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Número de concesión / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5328,8 +5376,8 @@ msgstr "¿Puede contener PII?"
 msgid "Begin typing to see a list of suggestions."
 msgstr "Comience a escribir para ver una lista de sugerencias."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5339,7 +5387,7 @@ msgstr ""
 ". Verifique que su organización no aparezca en la lista en una forma ligeramen"
 "te diferente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "¡El nombre que ingresó no era una de las sugerencias enumeradas!"
 
@@ -6145,6 +6193,11 @@ msgstr ""
 "Primero, busque un usuario por correo electrónico, luego selecciónelo de la li"
 "sta."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "defecto"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/fi/LC_MESSAGES/app.mo b/config/locale/fi/LC_MESSAGES/app.mo
index 71bf9d208d3a4d5dab0be0bee33ce181cde78b1b..8aeaf1b6b22b92f7d95d61b0d947f5d44b587aaf 100644
GIT binary patch
delta 26260
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
Jin#aq{vVd$tKt9v

delta 25964
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
WoT(38>Ef~nxw9vUiwt$|@cBOvBv+0A

diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po
index 96f363d55d..68a5bb7832 100644
--- a/config/locale/fi/app.po
+++ b/config/locale/fi/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish\n"
 "Language: fi\n"
@@ -139,8 +139,8 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Kirjaudu sisään tai rekisteröidy jatkaaksesi."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "Ei voida %{action} %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "Ei voida %{action} %{object}. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
@@ -239,19 +239,15 @@ msgstr "haku_kenttä ei vastaa"
 msgid "The search space does not have elements associated"
 msgstr "Hakualuella ei ole elementtejä"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Sinun on kirjauduttava sisään käyttääksesi tätä toimintoa"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha tarkastus epäonnistui, yritä uudelleen."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Sähköpostin lähettäminen onnistui."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Pyyntösi ei onnistu"
 
@@ -267,37 +263,37 @@ msgid "added"
 msgstr "lisä-"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "tallennettu"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -306,7 +302,7 @@ msgstr "tallenna"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -314,7 +310,7 @@ msgstr "poistettu"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -337,14 +333,14 @@ msgstr "Palautepyyntösi lähettäminen ei onnistunut juuri nyt."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Tapahtui virhe, kun pyysit palautetta tälle suunnitelmalle."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -353,14 +349,14 @@ msgstr "Tapahtui virhe, kun pyysit palautetta tälle suunnitelmalle."
 msgid "created"
 msgstr "luominen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -369,57 +365,57 @@ msgstr "luominen"
 msgid "create"
 msgstr "luo"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Ohjeryhmäsi on julkaistu ja se on nyt käytettävissä."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "julkaise"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr "Ohjeryhmäsi ei ole enää julkinen ja se ei siis ole käytettävissä."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "piilota"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "poistettu"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "poista"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Ohjeesi on julkaistu ja se on nyt käytettävissä."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Ohjeesi ei ole enää julkinen ja se ei siis ole käytettävissä."
 
@@ -451,19 +447,19 @@ msgstr "Tästä mallista ei voi luoda uutta versiota.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "päivitetty"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -553,7 +549,7 @@ msgid "Unable to delete this version of the template."
 msgstr "Tätä mallin versiota ei voi poistaa."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "kopio"
 
@@ -589,35 +585,35 @@ msgstr "Omat suunnitelmapohjani"
 msgid "Customizable Templates"
 msgstr "Mukautettavissa olevat suunnitelmapohjat"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Virhe linkkien jäsentämisessä %{template}:ssa"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 "Suunnitelmapohjan tekemiseen on käytetty %{application_name}:a. Viimeksi muoka"
 "ttu %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Aineistonhallinnan suunnitelmapohjan lataaminen ei onnistu tällä hetkellä."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Yhtään organisaatiota ei ole rekisteröity."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Valitse organisaatio"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Organisaatiotasi määrittelyssä on ongelmia."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Luotu käyttäen DMPTuulia. "
 
@@ -654,11 +650,11 @@ msgstr "Suunnitelma perustuu"
 msgid "template with customisations by the"
 msgstr "malli asiakassuhteiden mukauttamisella"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "kopionti"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -666,23 +662,23 @@ msgstr ""
 "Suunnitelman tilan muuttaminen ei onnistunut, koska vähintään %{percentage}:a "
 "vastauksista pitää olla vastattuna"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Suunnitelman tunnistetta %{plan_id} ei löydy"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Projektisi on nyt testimuodossa."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Projektisi ei ole enää testimuodossa."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Suunnitelman testistatuksen muuttaminen ei onnistu"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "Tunnukseen %{ ei liity suunnitelmaa<id}> s"
 
@@ -947,27 +943,27 @@ msgstr "Tilisi liitettiin onnistuneesti %{scheme}:n."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Tilisi liittäminen %{scheme}:hin ei onnistunut."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "%{username}n tilin %{action} onnistui."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "aktivoitu"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "pois käytöstä"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "%{username}:n %{action} ei onnistunut"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "aktivoi"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "kytke pois päältä"
 
@@ -1022,7 +1018,7 @@ msgid "Creators:"
 msgstr "Tekijät:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1149,7 +1145,7 @@ msgid "Public"
 msgstr "Julkinen"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Yksityinen"
 
@@ -1162,7 +1158,7 @@ msgid "Public: anyone can view."
 msgstr "Avattu: näkyvissä kaikille ilman DMPTuuli-kirjautumista"
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Yksityinen: rajattu minulle ja kutsumilleni henkilöille."
 
@@ -1324,76 +1320,131 @@ msgstr "Kysymys"
 msgid "Answer"
 msgstr "Vastaus"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr "Muokkaaja:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Otsikko:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Tekijät:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Päätutkija:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Päivänpäällikkö:"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Projektin ylläpitäjä:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Osallistuja:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Affiliaatio:"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Suunnitelmapohja:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr ""
 "Rahoitusnumero:\n"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Projektin tiivistelmä:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Viimeksi muokattu:"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Tekijänoikeustiedot:"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1412,12 +1463,12 @@ msgstr ""
 "yttö merkitse sitä, että tekijä kannattaisi suunnitelmaa tai että hänellä olis"
 "i jonkinlainen suhde projektiin tai esitykseen"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Ei vastausta"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "ei voi olla tyhjä"
 
@@ -1442,15 +1493,15 @@ msgstr "'Kysymys teksti' ei voi olla tyhjä."
 msgid "You must specify at least one role."
 msgstr "Sinun on määritettävä ainakin yksi rooli."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "ei voi olla tyhjä."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "ei voi olla tyhjä, jos sähköpostia ei ole annettu."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "ei voi olla tyhjä, jos nimeä ei ole annettu."
 
@@ -1483,11 +1534,11 @@ msgstr "jo määritetty arvo"
 msgid "Feedback email message"
 msgstr "Palautteen sähköpostiviesti"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "täytyy olla yksi seuraavista tiedostomuodoista: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "ei voi olla suurempi kuin 500KB"
 
@@ -1515,7 +1566,7 @@ msgstr "on oltava alkamispäivän jälkeen"
 msgid "guidance on"
 msgstr "ohjeistus"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "ei voi olla pienempi kuin nolla"
 
@@ -1551,51 +1602,51 @@ msgstr "Tuntematon muotoiluasetus"
 msgid "Invalid maximum pages"
 msgstr "Virheellinen enimmäismäärä sivuja"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Ohjepohjan edellistä versiota ei pysty muokkaamaan"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "kopion_tuottaminen! vaatii organisaatiokohteen."
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "%{template}:n kopio"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "version_tuottaminen! vaatii julkaistun mallipohjan"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "mukauta! vaatii kohteeksi organisaation"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "mukauta! vaatii rahoittajan mallipohjan"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Et voi julkaista julkaistua mallia."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Et voi julkaista tämän mallin historiallista versiota."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Et voi julkaista mallia ilman vaiheita."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Et voi julkaista mallia ilman osioita vaiheessa."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Et voi julkaista mallipohjaa ilman kysymyksiä."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Mallin ehdot viittaavat taaksepäin"
 
@@ -1761,11 +1812,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "on oltava myöhempi kuin %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Linkkihashit tarvitsevat \"org\" avaimen"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Linkeissä on oltava hash"
@@ -1819,7 +1870,7 @@ msgstr "Odota, standardit latautuvat"
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1827,7 +1878,7 @@ msgstr "Odota, standardit latautuvat"
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1966,7 +2017,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2001,7 +2052,7 @@ msgid "Roles"
 msgstr "roolit"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2011,7 +2062,7 @@ msgstr "roolit"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2024,7 +2075,7 @@ msgid "Remove"
 msgstr "Poista"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2488,6 +2539,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Onko sinulla jo %{application_name} -tili?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2542,7 +2594,7 @@ msgstr ""
 "n käyttäjille, ruksaa tämä laatikko.  Käyttäjät voivat valita, että tämä alaoh"
 "je näkyy, kun he vastaavat kysymyksiin 'Luo suunnitelma' -kohdassa."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr "(esim. Koulu/Osasto)"
 
@@ -2684,23 +2736,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Näin pääset alkuun:"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "Ensin"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Viimeinen"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Edellinen"
 
@@ -2876,42 +2928,42 @@ msgstr "Virhe:"
 msgid "Notice:"
 msgstr "Hei!"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Ladataan ..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Tämä kenttä on pakollinen."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Näytä salasana"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Valitse organisaatio listalta."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Organisaationi puuttuu listasta"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "Ei käytettävissä"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Piilota lista."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Katso lista partneri-instituutioista."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2919,27 +2971,27 @@ msgstr ""
 "Valitsemallesi tutkimusorganisaatiolle ja rahoittajalle ei löydy sopivaa malli"
 "pohjaa."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr "Valitse tutkimusorganisaatio ja rahoittaja ennen kuin jatkat."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Latautuu ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Osion sisällön lataaminen ei onnistu tällä hetkellä."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Kysymyksen sisällön lataaminen ei onnistu tällä hetkellä."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Avautuu uuteen ikkunaan"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2949,45 +3001,45 @@ msgstr ""
 "ksiin. Käytä Enter-näppäintä valitaksesi ehdotuksen tai Escape-näppäintä sulke"
 "aksesi ehdotukset."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Tuloillesi ei ole tuloksia."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Etsitään ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr "- Syötä hakutermi %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr "Yksikään tulos ei vastannut suodatusehtojasi."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "kiinni"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr "%{topic} haku"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Käytä suodattimia"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Valitse"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Napsauta valitaksesi %{item_name}"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Napsauta poistaaksesi %{item_name}"
 
@@ -3004,11 +3056,11 @@ msgid "Add Comment"
 msgstr "Lisää kommentti"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3278,7 +3330,7 @@ msgstr "Tyyppi"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3459,7 +3511,7 @@ msgstr "Teemoja ei ole valittu"
 msgid "Themed Guidance"
 msgstr "Teemavaihtoehdot"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3467,7 +3519,7 @@ msgstr ""
 "Voit tarkastella organisaation ohjausta napsauttamalla alla olevia linkkejä\n"
 "                        liittyvät tähän kysymykseen liittyviin aiheisiin."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3477,7 +3529,7 @@ msgstr ""
 "            Käyttäjät voivat sitten piilottaa / näyttää ohjeet muokkaamalla su"
 "unnitelmiaan."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3485,14 +3537,14 @@ msgstr ""
 "Tähän kysymykseen liittyviin aiheisiin ei liity organisaatiota koskevia ohjeit"
 "a."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Huomautukset"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Tietoa ei ole annettu"
 
@@ -3567,7 +3619,7 @@ msgstr "Tila"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3580,7 +3632,7 @@ msgstr "Julkaistu"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3631,7 +3683,7 @@ msgid "Template details"
 msgstr ""
 "Suunnitelmapohjan tiedot\n"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Lisää uusi jakso"
 
@@ -3994,7 +4046,7 @@ msgid "Homepage"
 msgstr "kotisivu"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Yhteyshenkilö"
 
@@ -4040,7 +4092,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Valinnainen alakohta"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4049,7 +4101,7 @@ msgstr "Valinnainen alakohta"
 msgid "No"
 msgstr "Ei"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4058,21 +4110,21 @@ msgstr "Ei"
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Piilota"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Julkaise"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4185,14 +4237,14 @@ msgstr "Lataa"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -4428,80 +4480,80 @@ msgstr "Kommentit ja ohjeet"
 msgid "Instructions"
 msgstr "Ohjeet"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Tiedostomuoto"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Asetukset"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Valitse vaihe ladattavaksi"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr ""
 "Valinnaiset suunnitelman osat\n"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "Projektin tiedot"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "Kysymyksen teksti ja osioiden otsikot"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "Vastaamattomat kysymykset"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr "tutkimustuloksista"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "lisäosiot, joita rahoittajat eivät edellytä"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "PDF:n muotoilu"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Fontti"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Marginaali (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Kirjasinlaji"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Koko"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Yläosa"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Alaosa"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Vasen"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Oikea"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5105,39 +5157,39 @@ msgstr "- Valitse aihealue -"
 msgid "- Select a repository type -"
 msgstr "- Valitse arkiston tyyppi -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr "Napsauta nähdäksesi %{subject}-tietovarastot"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Lisätietoja"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr "Tietovaraston URL-osoite"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Tietojen käyttö"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr "Pysyvä tunnistetyyppi"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr "Käytännöt"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Tietojen lataus"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "Palveluntarjoajan tyyppi"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr "Arkiston tyyppi"
 
@@ -5207,7 +5259,7 @@ msgid "Filter plans"
 msgstr "Suodata suunnitelmia"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Kysymykseen ei ole vastattu."
 
@@ -5216,47 +5268,43 @@ msgid "Plan Overview"
 msgstr "Suunnitelman yleiskatsaus"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 "Aineistonhallintasuunnitelman kirjoittamisessa on käytetty %{application_name}"
 ":a"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Otsikko:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Affiliaatio:"
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Tietojen hallinta:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "rahoittaja:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ORCID tunniste:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "Tunnus:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Aloituspäivämäärä:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Päättymispäivä:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Apurahan numero / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5302,8 +5350,8 @@ msgstr ""
 "Aloita kirjoittaminen, valitse listasta.\n"
 "\n"
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5312,7 +5360,7 @@ msgstr ""
 "Edellä nimeämällesi organisaatiolle luodaan uusi merkintä. Tarkista vielä kerr"
 "an, että organisaatiosi ei näy luettelossa hiukan eri muodossa."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Antamasi nimi ei ollut yksi luetelluista ehdotuksista!"
 
@@ -6097,6 +6145,11 @@ msgstr "Yhdistä tilit"
 msgid "First, search for a user by email, then select them from the list."
 msgstr "Etsi ensin käyttäjä sähköpostitse ja valitse sitten hän luettelosta."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "oletuksena"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/fr_CA/LC_MESSAGES/app.mo b/config/locale/fr_CA/LC_MESSAGES/app.mo
index 0f694f206cad35a9b089698c2fd217284eb96075..aceecf5bd409a3d64a54405de3eebb0e65951e2a 100644
GIT binary patch
delta 46
wcmezHiT%ST_J%Etg1p>@2D(P33WjD@21e6mco}730v1*V#@k(Z8Fk(O08UX1ZU6uP

delta 46
ucmezHiT%ST_J%Etg1p=YCb|aZ3WkPOM&{FHco}730>(gr?Jm5GI&T0@`wVvg

diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po
index cb010124e3..cdd2dddf2b 100644
--- a/config/locale/fr_CA/app.po
+++ b/config/locale/fr_CA/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr_CA\n"
@@ -137,7 +137,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous inscrire pour continuer."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -239,19 +239,15 @@ msgstr "Le search_space ne répond pas à chaque"
 msgid "The search space does not have elements associated"
 msgstr "L’espace de recherche n’est associé à aucun élément"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "La vérification Captcha a échoué, veuillez réessayer."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Le courriel du contact a été envoyé avec succès."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Il est impossible de soumettre votre demande"
 
@@ -267,37 +263,37 @@ msgid "added"
 msgstr "ajouté"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "enregistré"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -306,7 +302,7 @@ msgstr "enregistrer"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -314,7 +310,7 @@ msgstr "retiré"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -337,14 +333,14 @@ msgstr "Il est impossible de soumettre votre demande de commentaires pour le mom
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Une erreur s’est produite lors de la demande de commentaires pour ce plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -353,14 +349,14 @@ msgstr "Une erreur s’est produite lors de la demande de commentaires pour ce p
 msgid "created"
 msgstr "créé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -369,63 +365,63 @@ msgstr "créé"
 msgid "create"
 msgstr "créer"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Votre groupe de directives a été publié et est désormais accessible aux utilis"
 "ateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "publier"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Votre groupe de directives n’est plus publié et ne sera pas accessible aux uti"
 "lisateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "annuler la publication"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "supprimé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "supprimer"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 "Vos directives ont été publiées et sont désormais accessibles aux utilisateurs"
 "."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Vos directives ne sont plus publiés et ne seront pas accessibles aux utilisate"
@@ -459,19 +455,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "mis à jour"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -565,7 +561,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "copier"
 
@@ -601,35 +597,35 @@ msgstr "Vos modèles"
 msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Erreur d’analyse des liens pour un %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 "Modèle créé à l’aide du service %{application_name}. Dernière modification : %"
 "{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Il est impossible de télécharger le modèle du PGD pour le moment."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Aucun organisme n’est actuellement inscrit."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Votre organisme ne semble pas être correctement configuré."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Créé(e) avec %{application_name}. Dernière modification : %{date}"
 
@@ -666,11 +662,11 @@ msgstr "Ce plan est fondé sur "
 msgid "template with customisations by the"
 msgstr "modèle avec des personnalisations par le"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "copié"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -678,23 +674,23 @@ msgstr ""
 "Il est impossible de modifier l’état du plan, car il est nécessaire d’obtenir "
 "un taux de réponse d’au moins %{percentage}"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Il est impossible de trouver l’ID du plan %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Votre projet est maintenant à l’état d’essai."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Votre projet n’est plus à l’état d’essai."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Il est impossible de modifier l’état d’essai du plan"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -953,27 +949,27 @@ msgstr "Votre compte a bien été associé à %{scheme}."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Il est impossible d’associer votre compte à %{scheme}."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "La mesure %{action} pour %{username} a été effectuée avec succès."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "activé"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "Il est impossible de %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "activer"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "désactiver"
 
@@ -1030,7 +1026,7 @@ msgid "Creators:"
 msgstr "Créateurs :"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1158,7 +1154,7 @@ msgid "Public"
 msgstr "Public"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Privé"
 
@@ -1171,7 +1167,7 @@ msgid "Public: anyone can view."
 msgstr "Public : Tous peuvent consulter le plan."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privé : usage réservé à moi et aux personnes que j’invite."
 
@@ -1334,75 +1330,130 @@ msgstr "Question"
 msgid "Answer"
 msgstr "Réponse"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Personnalisé par:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Créateurs :"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Affiliation :"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Modèle :"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Numéro de subvention :"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Résumé du projet :"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Dernière modification :"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Renseignements sur le droit d’auteur :"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1422,12 +1473,12 @@ msgstr ""
 "e du texte du plan ne signifie pas que les créateurs approuvent votre projet o"
 "u votre proposition ou qu’il(s) y sont liés."
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Pas de réponse"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "doit être rempli(e)"
 
@@ -1452,15 +1503,15 @@ msgstr "pour « Texte de la question » doit être rempli(e)."
 msgid "You must specify at least one role."
 msgstr "Vous devez préciser au moins un rôle."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1493,11 +1544,11 @@ msgstr "une valeur a déjà été attribuée"
 msgid "Feedback email message"
 msgstr "Courriel de rétroaction"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "doit être dans l’un des formats suivants: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "ne peut pas dépasser 500 Ko"
 
@@ -1525,7 +1576,7 @@ msgstr "doit être postérieur à la date de début"
 msgid "guidance on"
 msgstr "directives sur"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "ne peut pas être inférieur à zéro"
 
@@ -1563,55 +1614,55 @@ msgstr "Paramètre de formatage inconnu"
 msgid "Invalid maximum pages"
 msgstr "Invalide – Nombre maximal de pages"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Un modèle historique ne peut pas être récupéré pour être modifié"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "un organisme cible est exigé pour generate_copy!"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Copie de %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "un modèle publié est exigé pour generate_version!"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "organisme cible exiger pour personnaliser!"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "un modèle d’un bailleur de fonds est exigé pour personnaliser!"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Vous ne pouvez pas publier un modèle déjà publié."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Vous ne pouvez pas publier une version historique de ce modèle."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Vous ne pouvez pas publier un modèle ne contenant pas de phases."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 "Vous ne pouvez pas publier un modèle dont une phase ne contient pas de section"
 "s."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 "Vous ne pouvez pas publier un modèle dont certaines sections ne contiennent pa"
 "s de questions."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Les conditions du modèle sont associées à une référence antérieure"
 
@@ -1774,11 +1825,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "doit être après %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Une clé \"org\" est attendue pour le code hash associé aux liens"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Un code hash est attendu pour les liens"
@@ -1833,7 +1884,7 @@ msgstr "Veuillez patienter. Le chargement des normes est en cours."
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1841,7 +1892,7 @@ msgstr "Veuillez patienter. Le chargement des normes est en cours."
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1981,7 +2032,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2018,7 +2069,7 @@ msgid "Roles"
 msgstr "Rôles"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2028,7 +2079,7 @@ msgstr "Rôles"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2041,7 +2092,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2504,6 +2555,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Avez-vous un compte %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2560,7 +2612,7 @@ msgstr ""
 "teurs pourront choisir d’afficher ces directives visant un sous-ensemble lorsq"
 "u’ils répondront aux questions de l’assistant « Créer un plan »."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (par exemple, école / département)"
 
@@ -2709,23 +2761,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Commencer :"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "Premier"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "…"
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Dernier"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Suivant"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Précédent"
 
@@ -2900,42 +2952,42 @@ msgstr "Erreur :"
 msgid "Notice:"
 msgstr "Remarque :"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr ""
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Sélectionnez un organisme dans la liste."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Mon organisme n’est pas répertorié"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "S. o."
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Masquer la liste."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Consulter la liste complète des établissements partenaires."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2943,29 +2995,29 @@ msgstr ""
 "Il est impossible de trouver un modèle approprié pour l’organisme de recherche"
 " et le bailleur de fonds que vous avez sélectionnés."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 "Veuillez sélectionner un organisme de recherche et un bailleur de fonds pour c"
 "ontinuer."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Chargement en cours..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Il est impossible de charger le contenu de la question pour le moment."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Il est impossible de charger le contenu de la question pour le moment."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "S’ouvre dans une nouvelle fenêtre"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2975,45 +3027,45 @@ msgstr ""
 "bas pour parcourir les suggestions. Utilisez la touche Entrée pour sélectionne"
 "r une suggestion ou la touche Échap pour fermer les suggestions."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Votre entrée n’a donné aucun résultat."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -3030,11 +3082,11 @@ msgid "Add Comment"
 msgstr "Ajouter un commentaire"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3308,7 +3360,7 @@ msgstr "Type"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3494,7 +3546,7 @@ msgstr "Aucun thème n’a été sélectionné"
 msgid "Themed Guidance"
 msgstr "Directives thématiques"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3502,7 +3554,7 @@ msgstr ""
 "Cliquez sur les liens ci-dessous pour afficher les directives organisationnell"
 "es pour les thèmes associés à cette question."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3512,7 +3564,7 @@ msgstr ""
 "            Les utilisateurs ont alors la possibilité de masquer ou d’afficher"
 " les directives lorsqu’ils modifient leur plan."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3520,14 +3572,14 @@ msgstr ""
 "Aucune directive organisationnelle n’est liée aux thèmes associés à cette ques"
 "tion."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Annotations"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Aucun fourni"
 
@@ -3604,7 +3656,7 @@ msgstr "État"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3617,7 +3669,7 @@ msgstr "Publié"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3669,7 +3721,7 @@ msgstr ""
 msgid "Template details"
 msgstr "Détails du modèle"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Ajouter une nouvelle phase"
 
@@ -4034,7 +4086,7 @@ msgid "Homepage"
 msgstr "Page d’accueil"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Contact"
 
@@ -4082,7 +4134,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Sous-ensemble facultatif"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4091,7 +4143,7 @@ msgstr "Sous-ensemble facultatif"
 msgid "No"
 msgstr "Non"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4100,21 +4152,21 @@ msgstr "Non"
 msgid "Yes"
 msgstr "Oui"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Annuler la publication"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Publier"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4230,14 +4282,14 @@ msgstr "Télécharger"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -4474,79 +4526,79 @@ msgstr ""
 msgid "Instructions"
 msgstr "Consignes"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Format"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Télécharger les paramètres"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Sélectionner la phase à télécharger"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Composants de plan facultatifs"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "page de couverture des détails du projet"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "texte des questions et en-têtes des sections"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "questions sans réponse"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "sections supplémentaires non demandées par l’organisme de financement"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "Format PDF"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Police de caractère"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Marge (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Police de caractère"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Taille"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Haut"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Bas"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Gauche"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Droite"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5140,39 +5192,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -5242,7 +5294,7 @@ msgid "Filter plans"
 msgstr "Filtrer les plans"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Question sans réponse."
 
@@ -5251,45 +5303,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "Un plan de gestion des données créé à l’aide de %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Affiliation :"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Bailleur de fonds :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ID ORCID :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5334,8 +5382,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Commencez à saisir des caractères pour voir une liste de suggestions."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5345,7 +5393,7 @@ msgstr ""
 ". Veuillez vérifier que votre organisme ne figure pas dans la liste sous une f"
 "orme légèrement différente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Le nom que vous avez entré ne faisait pas partie des suggestions répertoriées!"
 
@@ -6099,6 +6147,11 @@ msgstr ""
 "Commencez par rechercher un utilisateur par courriel, puis sélectionnez-le dan"
 "s la liste."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/fr_FR/LC_MESSAGES/app.mo b/config/locale/fr_FR/LC_MESSAGES/app.mo
index 723c542fc92a638cede67c0e94ff476cca3ea9e7..401aafcbe39358214373f301692290793a26f3cb 100644
GIT binary patch
delta 27113
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
R2$qKPQfE?%boB+K`5%l^9CZKy

delta 26804
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

diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po
index 351f69a9ef..a3aefb106b 100644
--- a/config/locale/fr_FR/app.po
+++ b/config/locale/fr_FR/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -140,12 +140,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous enregistrer afin de continuer."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "Impossible de %{action} le %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "Impossible de %{action} le %{object}. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
-msgstr "Avec succès %{action} le %{object}."
+msgstr "%{object} %{action} avec succès."
 
 #: ../../app/controllers/application_controller.rb:127
 msgid "API client"
@@ -240,19 +240,15 @@ msgstr "search_space ne répond pas à each"
 msgid "The search space does not have elements associated"
 msgstr "L'espace de recherche n'a aucun élément associé"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Vous devez être connecté pour utiliser cette fonctionnalité"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "la vérificatio du CAPTCHA a échouée, veuillez réessayer."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Mail de contact envoyé avec succès."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Impossible de soumettre votre demande"
 
@@ -268,37 +264,37 @@ msgid "added"
 msgstr "ajouté"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "enregistré"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -307,7 +303,7 @@ msgstr "enregistrer"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -315,7 +311,7 @@ msgstr "supprimé(e)"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -338,14 +334,14 @@ msgstr "Impossible de soumettre votre demande d'assistance conseil pour le momen
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Une erreur s'est produite lors de la demande de commentaires sur ce plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -354,14 +350,14 @@ msgstr "Une erreur s'est produite lors de la demande de commentaires sur ce plan
 msgid "created"
 msgstr "créé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -370,64 +366,64 @@ msgstr "créé"
 msgid "create"
 msgstr "créer"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
-"Votre groupe de recommendations a été publié et est disponible pour les utilis"
+"Votre groupe de recommandations a été publié et est disponible pour les utilis"
 "ateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "publier"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Votre groupe de recommentations n'est plus publié et ne sera plus disponible p"
 "our les utilisateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "dépublier"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "supprimé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "effacer"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
-msgstr "Votre recommendation a été publiée et est disponible pour les utilisateurs."
+msgstr "Votre recommandation a été publiée et est disponible pour les utilisateurs."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
-"Votre recommendation n'est plus publiée et ne sera plus disponible pour les ut"
+"Votre recommandation n'est plus publiée et ne sera plus disponible pour les ut"
 "ilisateurs."
 
 #: ../../app/controllers/identifiers_controller.rb:19
@@ -458,19 +454,19 @@ msgstr "Impossible de créer une nouvelle version de ce modèle.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "mis à jour"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -564,7 +560,7 @@ msgid "Unable to delete this version of the template."
 msgstr "Impossible de supprimer cette version du modèle."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "copier"
 
@@ -600,33 +596,33 @@ msgstr "Vos modèles"
 msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Erreur d'analyse des liens pour un %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr "Modèle créé avec %{application_name}. Dernière modification %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Impossible de télécharger le modèle de DMP pour le moment."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Aucun organisme n'est actuellement enregistré."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Votre organisme ne semble pas être correctement configurée."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Créé avec %{application_name}. Dernière modification %{date}"
 
@@ -663,11 +659,11 @@ msgstr "Ce plan est basé sur le"
 msgid "template with customisations by the"
 msgstr "modèle personnalisé par"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "copié"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -675,23 +671,23 @@ msgstr ""
 "Impossible de changer le statut du plan, au moins %{percentage} % de questions"
 " répondues sont nécessaires"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Impossible de trouver le plan avec l'identifiant %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Votre projet est maintenant un test."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Votre projet n'est plus un test."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Impossible de changer le statut du plan"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "Il n'y a pas de forfait associé à l'identifiant %{<id}> s"
 
@@ -787,7 +783,7 @@ msgstr "Le mot de passe et sa confirmation doivent correspondre"
 
 #: ../../app/controllers/research_outputs_controller.rb:217
 msgid "research output not found"
-msgstr "résultat de la recherche introuvable"
+msgstr "produit de recherche introuvable"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
@@ -964,27 +960,27 @@ msgstr "Votre compte a été lié à %{scheme} avec succès."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Impossible de lier votre compte avec %{scheme}."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "Compte de %{username} %{action} avec succès."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "activé"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "Impossible de %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "activer"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "désactiver"
 
@@ -1040,7 +1036,7 @@ msgid "Creators:"
 msgstr "Créateurs:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1168,7 +1164,7 @@ msgid "Public"
 msgstr "Public"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Privé"
 
@@ -1181,7 +1177,7 @@ msgid "Public: anyone can view."
 msgstr "Public : visible par tous."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privé : accès restreint aux personnes que j'invite."
 
@@ -1340,75 +1336,130 @@ msgstr "Question"
 msgid "Answer"
 msgstr "Réponse"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Personnalisé par : "
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Titre:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Créateurs : "
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Chercheur principal:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Gestionnaire de dates :"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Administrateur de projet:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Donateur:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Affiliation : "
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Modèle : "
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Numéro de subvention : "
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Résumé du projet : "
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Dernière modification : "
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Droits d'auteur"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1433,12 +1484,12 @@ msgstr ""
 "n quelconque avec,\n"
 "             votre projet ou proposition"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Non répondues"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "ne peut être vide"
 
@@ -1463,15 +1514,15 @@ msgstr "pour 'Texte de la question' ne peut pas être vide."
 msgid "You must specify at least one role."
 msgstr "Vous devez spécifier au moins un rôle."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "ne peut pas être vide."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "ne peut pas être vide si aucun courriel n'est fourni."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "ne peut pas être vide si aucun nom n'est fourni."
 
@@ -1504,11 +1555,11 @@ msgstr "a déjà une valeur attribuée"
 msgid "Feedback email message"
 msgstr "Message du mail de l'assistance conseil"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "doit être dans l'un des formats suivants : jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "ne peut peser plus de 500ko"
 
@@ -1536,7 +1587,7 @@ msgstr "doit être postérieur à la date de début"
 msgid "guidance on"
 msgstr "recommandation concernant"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "ne peut être inférieur à zéro"
 
@@ -1574,51 +1625,51 @@ msgstr "Réglage de mise en forme"
 msgid "Invalid maximum pages"
 msgstr "Nombre de pages maxi non valide"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Un modèle historisé ne peut être extrait pour modification"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! nécessite un organisme cible"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Copie de %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generate_version! nécessite un modèle publie"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "customize! nécessite un organisme cible"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "customize! nécessite le modèle d'un financeur"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Vous ne pouvez pas publier un modèle publié."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Vous ne pouvez pas publier une ancienne version de ce modèle."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Vous ne pouvez pas publier un modèle sans phases."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Vous ne pouvez pas publier un modèle sans sections dans une phase."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Vous ne pouvez pas publier un modèle sans questions dans une section."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr ""
 "Les conditions du modèle s'appliquent à une question positionnée avant celle-c"
@@ -1781,11 +1832,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "doit être après %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Une clé \"org\" est attendu pour la table de hachage des liens"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Un hash est attendu pour les liens"
@@ -1839,7 +1890,7 @@ msgstr "Merci de patienter, les standards sont en cours de chargement"
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1847,7 +1898,7 @@ msgstr "Merci de patienter, les standards sont en cours de chargement"
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1987,7 +2038,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2024,7 +2075,7 @@ msgid "Roles"
 msgstr "Rôles"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2034,7 +2085,7 @@ msgstr "Rôles"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2047,7 +2098,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2511,6 +2562,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Avez vous un compte sur %{application_name} ?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2567,7 +2619,7 @@ msgstr ""
 "es utilisateurs pourront choisir d'afficher ce sous-groupe de recommandations "
 "lorsqu'ils répondront aux questions dans l'onglet 'créer un plan'."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (par ex. : Ecole/Département) "
 
@@ -2649,11 +2701,11 @@ msgid ""
 "ally displayed across all templates rather than having to write guidance to ac"
 "company each."
 msgstr ""
-"Vous pouvez écrire des recommendations qui peuvent être affichées par theme (e"
-"x: recommendation générique sur le stockage et la sauvegarde devant être prése"
-"nte systèmatiquement). Ecrire une recommendation générique par theme vous fera"
+"Vous pouvez écrire des recommandations qui peuvent être affichées par thème (e"
+"x: recommandation générique sur le stockage et la sauvegarde devant être prése"
+"nte systématiquement). Écrire une recommandation générique par thème vous fera"
 " gagner du temps car votre conseil sera automatiquement affiché sur tous les m"
-"odèles plutot que de devoir écrire une recommandation accompagnant chacun d'eu"
+"odèles plutôt que de devoir écrire une recommandation accompagnant chacun d'eu"
 "x."
 
 #: ../../app/views/guidances/admin_index.html.erb:35
@@ -2714,23 +2766,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Pour commencer :"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "Premier"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Dernier"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Suivant"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Précédent"
 
@@ -2905,42 +2957,42 @@ msgstr "Erreur :"
 msgid "Notice:"
 msgstr "Note :"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Ce champ est obligatoire."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Sélectionner un organisme dans la liste."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Mon organisme n'est pas dans la liste"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "N/D"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Cacher la liste."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Voir la liste des institutions partenaires."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2948,29 +3000,29 @@ msgstr ""
 "Impossible de trouver un modèle approprié à l'organisme de recherche et au fin"
 "anceur que vous avez sélectionnés."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 "Veuillez sélectionner un organisme de recherche et un financeur pour continuer"
 "."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Chargement ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Impossible de charger le contenu de la section pour le moment."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Impossible de charger le contenu de la question pour le moment."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Ouvre une nouvelle fenêtre"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2980,45 +3032,45 @@ msgstr ""
 "ir les suggestions. Utilisez la touche Entrée pour sélectionner une suggestion"
 " ou la touche Échap pour fermer les suggestions."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Aucun résultat n'est disponible pour votre recherche."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Recherche..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
-msgstr "- Entrez un terme de recherche %{examples} -"
+msgstr "- Entrez un critère de recherche %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
-msgstr "Aucun résultat ne correspond à vos critères de filtre."
+msgstr "Aucun résultat ne correspond à vos critères de filtrage."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "Fermer"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
-msgstr "Recherche %{topic}"
+msgstr "Rechercher %{topic}"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Appliquer le(s) filtre(s)"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Cliquez pour sélectionner %{item_name}"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Cliquez pour supprimer %{item_name}"
 
@@ -3035,11 +3087,11 @@ msgid "Add Comment"
 msgstr "Ajouter un commentaire"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3212,7 +3264,7 @@ msgstr "Personnaliser la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:11
 msgid "Edit phase"
-msgstr "Edtier la phase"
+msgstr "Editer la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:13
 msgid "Show phase"
@@ -3312,7 +3364,7 @@ msgstr "Type"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3499,7 +3551,7 @@ msgstr "Aucun thème sélectionné"
 msgid "Themed Guidance"
 msgstr "Recommandation associée à un thème"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3508,7 +3560,7 @@ msgstr ""
 "sme\n"
 "                        liées aux thèmes associés à cette question."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3519,7 +3571,7 @@ msgstr ""
 "            Les utilisateurs ont ensuite la possibilité de masquer / afficher "
 "des recommandations lors de la modification de leur plan."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3527,14 +3579,14 @@ msgstr ""
 "Il n’existe aucune recommandation d'organisme liée aux thèmes associés à cette"
 " question."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Annotations"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Aucune fournie"
 
@@ -3610,7 +3662,7 @@ msgstr "Statut"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3623,7 +3675,7 @@ msgstr "Publié"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3675,7 +3727,7 @@ msgstr ""
 msgid "Template details"
 msgstr "Détails du modèle"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Ajouter une nouvelle phase"
 
@@ -3940,7 +3992,7 @@ msgstr "URLs de l'organisme"
 #: ../../app/views/orgs/_profile_form.html.erb:91
 #: ../../app/views/orgs/_profile_form.html.erb:96
 msgid "Help Desk email"
-msgstr "E-mail du service d'assistance"
+msgstr "Courriel du service d'assistance"
 
 #: ../../app/views/orgs/_profile_form.html.erb:105
 msgid "Administrator contact"
@@ -4038,7 +4090,7 @@ msgid "Homepage"
 msgstr "Page d'accueil"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Contact"
 
@@ -4084,7 +4136,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Sous-ensemble facultatif"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4093,7 +4145,7 @@ msgstr "Sous-ensemble facultatif"
 msgid "No"
 msgstr "Non"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4102,26 +4154,26 @@ msgstr "Non"
 msgid "Yes"
 msgstr "Oui"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Dépublier"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Publier"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Vous allez effacer '%{guidance_group_name}'. Cela impactera les recommendation"
+"Vous allez effacer '%{guidance_group_name}'. Cela impactera les recommandation"
 "s. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
@@ -4229,14 +4281,14 @@ msgstr "Télécharger"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -4300,11 +4352,11 @@ msgstr "Non applicable"
 
 #: ../../app/views/paginable/research_outputs/_index.html.erb:13
 msgid "Repository"
-msgstr "Dépôt"
+msgstr "Entrepôt"
 
 #: ../../app/views/paginable/research_outputs/_index.html.erb:16
 msgid "Release date"
-msgstr "Date de sortie"
+msgstr "Date de publication"
 
 #: ../../app/views/paginable/research_outputs/_index.html.erb:19
 msgid "Access level"
@@ -4474,79 +4526,79 @@ msgstr "Commentaires & Recommandations"
 msgid "Instructions"
 msgstr "Instructions"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Format"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Paramètres de téléchargement"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Sélectionner la phase à télécharger"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Eléments optionnels du plan"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "page de renseignements sur le projet"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "texte de la question et entête de la section"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "questions non répondues"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
-msgstr "résultats de la recherche"
+msgstr "produits de recherche"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "section(s) supplémentaire(s) non requise(s) par l'organisme financeur"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "Mise en forme du PDF"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Police de caractères"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Marge (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Police"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Taille"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Haut"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Bas"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Gauche"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Droite"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -4569,7 +4621,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
 msgid "Select up to 6 organisations to see their guidance."
-msgstr "Choisissez jusqu'à 6 organismes pour voir leurs recommendations."
+msgstr "Choisissez jusqu'à 6 organismes pour voir leurs recommandations."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:18
 msgid "Find guidance from additional organisations below"
@@ -4616,7 +4668,7 @@ msgstr "Rédiger"
 
 #: ../../app/views/plans/_navigation.html.erb:22
 msgid "Research Outputs"
-msgstr "Résultats de la recherche"
+msgstr "Produit de recherche"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
@@ -5018,8 +5070,8 @@ msgid ""
 "Your research output abbreviation can be used as a reference when answering th"
 "is plan's questions."
 msgstr ""
-"L'abréviation de votre résultat de recherche peut être utilisée comme référenc"
-"e pour répondre aux questions de ce plan."
+"L'abréviation de votre produit de recherche peut être utilisée comme référence"
+" pour répondre aux questions de ce plan."
 
 #: ../../app/views/research_outputs/_form.html.erb:7
 msgid ""
@@ -5043,20 +5095,20 @@ msgid ""
 "nuing basis. (From https://codata.org/rdm-glossary/personally-identifiable-inf"
 "ormation/)"
 msgstr ""
-"Les référentiels préservent, gèrent et donnent accès à de nombreux types de do"
-"cuments numériques dans une variété de formats. Les matériaux des référentiels"
-" en ligne sont organisés pour permettre la recherche, la découverte et la réut"
-"ilisation. Il doit y avoir un contrôle suffisant pour que le matériel numériqu"
-"e soit authentique, fiable, accessible et utilisable en permanence. (Tiré de h"
-"ttps://codata.org/rdm-glossary/personally-identifiable-information/)"
+"Les entrepôts préservent, gèrent et donnent accès à de nombreux types de docum"
+"ents numériques dans une variété de formats. Les matériaux des entrepôts en li"
+"gne sont organisés pour permettre la recherche, la découverte et la réutilisat"
+"ion. Il doit y avoir un contrôle suffisant pour que le matériel numérique soit"
+" authentique, fiable, accessible et utilisable en permanence. (Tiré de https:/"
+"/codata.org/rdm-glossary/personally-identifiable-information/)"
 
 #: ../../app/views/research_outputs/_form.html.erb:16
 msgid "Please describe the output type"
-msgstr "Veuillez décrire le type de sortie"
+msgstr "Veuillez décrire le type de produit"
 
 #: ../../app/views/research_outputs/_form.html.erb:44
 msgid "Abbreviation"
-msgstr "Abréviation"
+msgstr "Nom abrégé"
 
 #: ../../app/views/research_outputs/_form.html.erb:73
 #: ../../app/views/shared/export/_plan_outputs.erb:26
@@ -5065,28 +5117,28 @@ msgstr "Peut contenir des données sensibles ?"
 
 #: ../../app/views/research_outputs/_form.html.erb:80
 msgid "May contain personally identifiable information?"
-msgstr "Peut contenir des informations personnellement identifiables ?"
+msgstr "Peut contenir des informations personnelles ?"
 
 #: ../../app/views/research_outputs/_form.html.erb:90
 msgid "Intended repositories"
-msgstr "Référentiels prévus"
+msgstr "Entrepôts prévus"
 
 #: ../../app/views/research_outputs/_form.html.erb:99
 msgid "Add a repository"
-msgstr "Ajouter un référentiel"
+msgstr "Ajouter un entrepôt"
 
 #: ../../app/views/research_outputs/_form.html.erb:114
 msgid "Metadata standards"
-msgstr "Normes de métadonnées"
+msgstr "Standards de métadonnées"
 
 #: ../../app/views/research_outputs/_form.html.erb:122
 msgid "Add a metadata standard"
-msgstr "Ajouter une norme de métadonnées"
+msgstr "Ajouter un standard de métadonnées"
 
 #: ../../app/views/research_outputs/_form.html.erb:136
 #: ../../app/views/shared/export/_plan_outputs.erb:20
 msgid "Anticipated release date"
-msgstr "Date de sortie prévue"
+msgstr "Date de publication prévue"
 
 #: ../../app/views/research_outputs/_form.html.erb:140
 #: ../../app/views/shared/export/_plan_outputs.erb:21
@@ -5105,15 +5157,15 @@ msgstr "Édition %{research_output_title}"
 #: ../../app/views/research_outputs/edit.html.erb:13
 #: ../../app/views/research_outputs/new.html.erb:13
 msgid "View all research outputs"
-msgstr "Voir tous les résultats de la recherche"
+msgstr "Voir tous les produits de recherche"
 
 #: ../../app/views/research_outputs/index.html.erb:14
 msgid "Please list your anticipated research output(s)."
-msgstr "Veuillez énumérer vos résultats de recherche prévus."
+msgstr "Veuillez lister les produits de recherche prévus."
 
 #: ../../app/views/research_outputs/index.html.erb:30
 msgid "Add a research output"
-msgstr "Ajouter un résultat de recherche"
+msgstr "Ajouter un produit de recherche"
 
 #: ../../app/views/research_outputs/licenses/_form.html.erb:24
 msgid "Initial license"
@@ -5125,7 +5177,7 @@ msgstr "Pour obtenir des conseils sur la sélection d'une licence :"
 
 #: ../../app/views/research_outputs/new.html.erb:12
 msgid "New research output"
-msgstr "Nouvelle production de recherche"
+msgstr "Nouveau produit de recherche"
 
 #: ../../app/views/research_outputs/repositories/_search.html.erb:5
 msgid ""
@@ -5146,47 +5198,47 @@ msgstr "Sélectionnez un domaine pour affiner votre recherche."
 
 #: ../../app/views/research_outputs/repositories/_search.html.erb:12
 msgid "- Select a subject area -"
-msgstr "- Sélectionnez un domaine -"
+msgstr "- Sélectionnez un domaine d'étude -"
 
 #: ../../app/views/research_outputs/repositories/_search.html.erb:21
 msgid "- Select a repository type -"
-msgstr "- Sélectionnez un type de référentiel -"
+msgstr "- Sélectionnez un type d’entrepôt -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
-msgstr "Cliquez pour afficher les référentiels liés à %{subject}"
+msgstr "Cliquez pour afficher les entrepôts liés à %{subject}"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Plus d'informations"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
-msgstr "URL du référentiel"
+msgstr "URL de l'entrepôt"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Accès aux données"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
-msgstr "Type d'identifiant persistant"
+msgstr "Type d'identifiant pérenne"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
-msgstr "Stratégies"
+msgstr "Politiques"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Téléchargement de données"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "Type de fournisseur"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
-msgstr "Type de référentiel"
+msgstr "Type d'entrepôt"
 
 #: ../../app/views/shared/_create_account_form.html.erb:8
 msgid "Last Name"
@@ -5254,54 +5306,50 @@ msgid "Filter plans"
 msgstr "Filtrer les plans"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Question sans réponse."
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:2
 msgid "Plan Overview"
-msgstr "Aperçu du forfait"
+msgstr "Vue d'ensemble"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "Plan de gestion de données créé à l'aide de %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Titre:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Affiliation : "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Gestionnaire de données:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Financeur:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "Identifiant ORCID : "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "Identifiant :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Date de début:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Date de fin:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Numéro de subvention / URL :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5317,15 +5365,15 @@ msgstr ""
 
 #: ../../app/views/shared/export/_plan_outputs.erb:3
 msgid "Planned Research Outputs"
-msgstr "Résultats de recherche prévus"
+msgstr "Produits de recherche prévus"
 
 #: ../../app/views/shared/export/_plan_outputs.erb:14
 msgid "Planned research output details"
-msgstr "Détails des résultats de recherche prévus"
+msgstr "Détails des produits de recherche prévus"
 
 #: ../../app/views/shared/export/_plan_outputs.erb:22
 msgid "Intended repository(ies)"
-msgstr "Dépôt(s) prévu(s)"
+msgstr "Entrepôt(s) prévu(s)"
 
 #: ../../app/views/shared/export/_plan_outputs.erb:24
 msgid "License"
@@ -5333,11 +5381,11 @@ msgstr "Licence"
 
 #: ../../app/views/shared/export/_plan_outputs.erb:25
 msgid "Metadata standard(s)"
-msgstr "Norme(s) de métadonnées"
+msgstr "Standard(s) de métadonnées"
 
 #: ../../app/views/shared/export/_plan_outputs.erb:27
 msgid "May contain PII?"
-msgstr "Peut contenir des PII ?"
+msgstr "Peut contenir des informations personnelles ?"
 
 #: ../../app/views/shared/org_selectors/_combined.html.erb:15
 #: ../../app/views/shared/org_selectors/_external_only.html.erb:13
@@ -5345,8 +5393,8 @@ msgstr "Peut contenir des PII ?"
 msgid "Begin typing to see a list of suggestions."
 msgstr "Commencez à taper pour voir une liste de suggestions."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5356,7 +5404,7 @@ msgstr ""
 "sus. Veuillez vérifier que votre organisme n'apparaît pas dans la liste sous u"
 "ne forme légèrement différente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "L'organisme que vous avez saisi ne figure pas dans la liste"
 
@@ -5726,7 +5774,7 @@ msgid ""
 "organisation."
 msgstr ""
 "Afin de fournir l'accès à %{application_name} et personnaliser votre expérienc"
-"e utilisateur (ex: mise à disposition de modèles pertinents et de recommendati"
+"e utilisateur (ex: mise à disposition de modèles pertinents et de recommandati"
 "ons provenant de votre organisation)."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
@@ -6197,6 +6245,11 @@ msgstr ""
 "Commencez par rechercher un utilisateur par courriel, puis sélectionnez-le dan"
 "s la liste."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "défaut"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
@@ -6556,7 +6609,7 @@ msgstr ""
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:41
 msgid "Review plans"
-msgstr "Examiner les plans"
+msgstr "Relecture des plans"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:51
 msgid "Allows the user to create new organisations"
diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo
index 79c9f59675a0d2363c2602562ef41d79c2ad403c..60d4d157ddbbdeda2c6fdf6a4c042d80737ab291 100644
GIT binary patch
delta 26323
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

delta 25982
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
RCZwRZQb5e`(%vm`{|~1)YQO*h

diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po
index 57c3302259..a063f3770b 100644
--- a/config/locale/pt_BR/app.po
+++ b/config/locale/pt_BR/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese\n"
 "Language: pt_BR\n"
@@ -137,8 +137,8 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Você precisa entrar ou registrar-se antes de continuar."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "Não é possível %{action} o %{object}. {erros}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "Não é possível %{action} o %{object}. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
@@ -237,19 +237,15 @@ msgstr "O search_space não responde a cada"
 msgid "The search space does not have elements associated"
 msgstr "O espaço de pesquisa não possui elementos associados"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Você precisa estar conectado para usar esta funcionalidade"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "A verificação do Captcha falhou. Tente novamente."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Email de contato foi enviado com sucesso."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Não é possível enviar sua solicitação"
 
@@ -265,37 +261,37 @@ msgid "added"
 msgstr "adicionado"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "salvo"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -304,7 +300,7 @@ msgstr "Salvar"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -312,7 +308,7 @@ msgstr "removido"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -335,14 +331,14 @@ msgstr "Não conseguimos submeter seu pedido de feedback neste momento."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Ocorreu um erro ao solicitar feedback para este plano."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -351,14 +347,14 @@ msgstr "Ocorreu um erro ao solicitar feedback para este plano."
 msgid "created"
 msgstr "criado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -367,61 +363,61 @@ msgstr "criado"
 msgid "create"
 msgstr "criar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Seu grupo de instruções foi publicado e agora está disponível para os usuários"
 "."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "publicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Seu grupo de instruções não é mais publicado e não estará disponível para os u"
 "suários."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "cancelar publicação"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "apagado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "excluir"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Suas instruções foram publicadas e agora estão disponíveis para os usuários."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Suas instruções não são mais publicadas e não estarão disponíveis para os usuá"
@@ -455,19 +451,19 @@ msgstr "Não foi possível criar uma nova versão deste modelo.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "Atualizado"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -557,7 +553,7 @@ msgid "Unable to delete this version of the template."
 msgstr "Não foi possível excluir esta versão do modelo."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "cópia"
 
@@ -593,33 +589,33 @@ msgstr "Modelos Próprios"
 msgid "Customizable Templates"
 msgstr "Modelos customizáveis"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Erro ao analisar links para um %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr "Modelo criado usando %{application_name}. Última modificação %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Não conseguimos baixar o Modelo de PGD neste momento."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "No momento não há nenhuma organização registrada."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Por favor, escolha uma organização."
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Parece que sua organização não está configurada corretamente."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Criado usando %{application_name}. Última modificação %{date}"
 
@@ -656,11 +652,11 @@ msgstr "Este plano é baseado no"
 msgid "template with customisations by the"
 msgstr "modelo com personalizações pelo"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "copieado"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -668,23 +664,23 @@ msgstr ""
 "Não conseguimos mudar o status do plano. É preciso pelo menos %{percentage} de"
 " respostas."
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Não conseguimos encontrar o plano com id %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Seu projeto agora é um teste."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Seu projeto não é mais um teste."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Não conseguimos mudar o status de teste do plano"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "Não há plano associado ao id %{<id}> s"
 
@@ -953,27 +949,27 @@ msgstr "Sua conta foi vinculada a %{scheme}."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Não é possível vincular sua conta a% {scheme}."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "Successo ao %{action} conta do %{username}"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "ativado"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "desativado"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "Incapaz de %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "Ativo"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "desativar"
 
@@ -1029,7 +1025,7 @@ msgid "Creators:"
 msgstr "Criadores:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1156,7 +1152,7 @@ msgid "Public"
 msgstr "Público"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Privado"
 
@@ -1169,7 +1165,7 @@ msgid "Public: anyone can view."
 msgstr "Público: qualquer pessoa pode ver."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privado: restrito a mim e a meus convidados."
 
@@ -1328,75 +1324,130 @@ msgstr "Pergunta"
 msgid "Answer"
 msgstr "Resposta"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Customizado Por: "
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Título:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Criadores:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Investigador principal:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Gerenciador de datas:"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Administrador de projetos:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Contribuinte:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Afiliação: "
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Modelo: "
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Número da Concessão"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Resumo do projeto:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Última modificação: "
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Informação de copyright"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1420,12 +1471,12 @@ msgstr ""
 "relação com\n"
 "             seu projeto ou proposta"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Não Respondido"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "não pode estar em branco"
 
@@ -1450,15 +1501,15 @@ msgstr "para \"Texto da pergunta\" não pode estar em branco."
 msgid "You must specify at least one role."
 msgstr "Você deve especificar pelo menos uma função."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "não pode ficar em branco."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "não pode ficar em branco se nenhum e-mail for fornecido."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "não pode ficar em branco se nenhum nome for fornecido."
 
@@ -1491,11 +1542,11 @@ msgstr "já atribuiu um valor"
 msgid "Feedback email message"
 msgstr "Mensagem de email de feedback"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "deve ser um dos seguintes formatos: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "não pode ser maior que 500KB"
 
@@ -1523,7 +1574,7 @@ msgstr "deve ser posterior à data de início"
 msgid "guidance on"
 msgstr "instruções sobre"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "não pode ser menor que zero"
 
@@ -1561,51 +1612,51 @@ msgstr "Parâmetro de formatação desconhecido"
 msgid "Invalid maximum pages"
 msgstr "Máximo de páginas inválido"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Um modelo histórico não pode ser recuperado para ser modificado"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requer uma meta de organização"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Cópia do %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generate_version! requer um modelo publicado"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "customizar! requer uma meta de organização"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "customizar! requer um modelo de um financiador"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Você não pode publicar um modelo publicado."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Você não pode publicar uma versão histórica deste modelo."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Você não pode publicar um modelo sem fases."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Você não pode publicar um modelo sem seções em uma fase."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Você não pode publicar um modelo sem perguntas em uma seção."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "As condições no modelo se referem ao contrário"
 
@@ -1765,11 +1816,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "deve ser depois de %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Uma \"org\" chave é esperada para hash de links"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Espera-se uma 'jogo da velha' para os links"
@@ -1823,7 +1874,7 @@ msgstr "Por favor, espere enquanto os Padrões são carregados."
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1831,7 +1882,7 @@ msgstr "Por favor, espere enquanto os Padrões são carregados."
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1971,7 +2022,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -2006,7 +2057,7 @@ msgid "Roles"
 msgstr "Papéis"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2016,7 +2067,7 @@ msgstr "Papéis"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2029,7 +2080,7 @@ msgid "Remove"
 msgstr "Remover"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2492,6 +2543,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Você tem uma conta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2547,7 +2599,7 @@ msgstr ""
 "ão escolher a exibição dessas instruções especiais quando estiverem respondend"
 "o as questões no wizard 'criar plano'."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (e.g. Instituição/ Departamento) "
 
@@ -2692,23 +2744,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Começando"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "Primeiro"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Último"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Próximo"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Anterior"
 
@@ -2883,42 +2935,42 @@ msgstr "Erro"
 msgid "Notice:"
 msgstr "Nota:"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Mostrar senha"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Selecione uma organização da lista."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Minha organização não está listada"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "N/A"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Esconder lista."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Veja a lista completa de instituições parceiras"
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2926,29 +2978,29 @@ msgstr ""
 "Não conseguimos encontrar um modelo adequado para a instituição de pesquisa e "
 "o órgão financiador que você selecionou."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr ""
 "Por favor, selecione uma instituição de pesquisa e um órgão financiador para c"
 "ontinuar."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Carregando ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Não carregar o conteúdo da seção neste momento."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Não foi carregar o conteúdo da pergunta no momento."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Abre em uma nova janela"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2958,45 +3010,45 @@ msgstr ""
 " navegar pelas sugestões. Use a tecla Enter para selecionar uma sugestão ou a "
 "tecla Escape para fechar as sugestões."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Nenhum resultado está disponível para sua entrada."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Procurando ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr "- Digite um termo de pesquisa %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr "Nenhum resultado correspondeu aos seus critérios de filtro."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "Fechar"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr "%{topic} pesquisa"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Aplicar filtro (s)"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Clique para selecionar %{item_name}"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Clique para remover %{item_name}"
 
@@ -3013,11 +3065,11 @@ msgid "Add Comment"
 msgstr "Adicionar Comentário"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3289,7 +3341,7 @@ msgstr "Tipo"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3472,7 +3524,7 @@ msgstr "Nenhum tema selecionado"
 msgid "Themed Guidance"
 msgstr "Orientação Temática"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3480,7 +3532,7 @@ msgstr ""
 "Clique nos links abaixo para ver a orientação organizacional\n"
 "                        relacionados aos temas associados a esta questão."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3490,7 +3542,7 @@ msgstr ""
 "            Os usuários podem ocultar / exibir a orientação ao editar seu plan"
 "o."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3498,14 +3550,14 @@ msgstr ""
 "Não há orientação organizacional relacionada aos temas associados a essa quest"
 "ão."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Anotações"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Nenhum fornecido"
 
@@ -3577,7 +3629,7 @@ msgstr "Status"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3590,7 +3642,7 @@ msgstr "Publicado"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3642,7 +3694,7 @@ msgstr ""
 msgid "Template details"
 msgstr "Detalhes do modelo"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Acrescente nova fase"
 
@@ -4006,7 +4058,7 @@ msgid "Homepage"
 msgstr "Pagina inicial"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Contato"
 
@@ -4052,7 +4104,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Subconjunto opcional"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4061,7 +4113,7 @@ msgstr "Subconjunto opcional"
 msgid "No"
 msgstr "Não"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4070,21 +4122,21 @@ msgstr "Não"
 msgid "Yes"
 msgstr "Sim"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Despublicar"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Publicar"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4197,14 +4249,14 @@ msgstr "Baixar"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -4441,79 +4493,79 @@ msgstr "Comentários e orientações"
 msgid "Instructions"
 msgstr "Instruções"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Formato"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Baixar parâmetros"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Selecione a fase a ser baixada"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Componentes opcionais do plano"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "capa com detalhes do projeto"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "texto das questões e cabeçalhos das seções"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "questões não respondida"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr "resultados de pesquisa"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "seção(ões) suplementar(es) não solicitada(s) pela organização financiadora"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "Formatação de PDF"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Fonte"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Margem (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Face"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Alto"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Fim da página"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Direito"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5116,39 +5168,39 @@ msgstr "- Selecione uma área de assunto -"
 msgid "- Select a repository type -"
 msgstr "- Selecione um tipo de repositório -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr "Clique para ver os repositórios relacionados a %{subject}"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Mais informações"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr "URL do repositório"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Acesso de dados"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr "Tipo de identificador persistente"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Upload de dados"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "Tipo de provedor"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr "Tipo de repositório"
 
@@ -5218,7 +5270,7 @@ msgid "Filter plans"
 msgstr "Filtrar planos"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Pergunta não respondida."
 
@@ -5227,45 +5279,41 @@ msgid "Plan Overview"
 msgstr "Visão geral do plano"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "Um Plano de Gestão de Dados criado usando %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Título:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Afiliação: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Gerenciador de dados:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Financiador:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ORCID iD: "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "EU IA:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Data de início:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Data final:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Número de concessão / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5309,8 +5357,8 @@ msgstr "Pode conter PII?"
 msgid "Begin typing to see a list of suggestions."
 msgstr "Comece a digitar para ver uma lista de sugestões."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5319,7 +5367,7 @@ msgstr ""
 "Uma nova entrada será criada para a organização que você nomeou acima. Verifiq"
 "ue se sua organização não aparece na lista de forma um pouco diferente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "O nome digitado não foi uma das sugestões listadas!"
 
@@ -6119,6 +6167,11 @@ msgstr "Mesclar contas"
 msgid "First, search for a user by email, then select them from the list."
 msgstr "Primeiro, pesquise um usuário por email e selecione-o na lista."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "predefinição"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/sv_FI/LC_MESSAGES/app.mo b/config/locale/sv_FI/LC_MESSAGES/app.mo
index 75537c8f699a29b2f47ec28c2d32f8f1068ee0de..352f6fb5befcd84cfa6afd73076fdc0071301541 100644
GIT binary patch
delta 26310
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
JpjX8t{|_q>%)bBt

delta 25960
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
KT-c{_;{ONYUsL-4

diff --git a/config/locale/sv_FI/app.po b/config/locale/sv_FI/app.po
index 719da1c389..7eb3b1a7b2 100644
--- a/config/locale/sv_FI/app.po
+++ b/config/locale/sv_FI/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish\n"
 "Language: sv_FI\n"
@@ -137,8 +137,8 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Du behöver logga in eller registrera dig innan du kan fortsätta."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
-msgstr "Det går inte att %{action} %{object}. {fel}"
+msgid "Unable to %{action} the %{object}. %{errors}"
+msgstr "Det går inte att %{action} %{object}. %{errors}"
 
 #: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %{action} the %{object}."
@@ -237,19 +237,15 @@ msgstr "Search_space svarar inte på varje"
 msgid "The search space does not have elements associated"
 msgstr "Sökutrymmet har inga element associerade"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr "Du måste vara inloggad för att använda den här funktionen"
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha-verifiering misslyckades, försök igen."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Kontaktadressen skickades med framgång."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Det gick inte att skicka din förfrågan"
 
@@ -265,37 +261,37 @@ msgid "added"
 msgstr "Lagt till"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "sparade"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -304,7 +300,7 @@ msgstr "spara"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -312,7 +308,7 @@ msgstr "tog bort"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -335,14 +331,14 @@ msgstr "Det gick inte att skicka din begäran om återkoppling just nu."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Ett fel uppstod när du begärde feedback för den här planen."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -351,14 +347,14 @@ msgstr "Ett fel uppstod när du begärde feedback för den här planen."
 msgid "created"
 msgstr "skapad"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -367,59 +363,59 @@ msgstr "skapad"
 msgid "create"
 msgstr "skapa"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Din vägledning har publicerats och är nu tillgänglig för användarna."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "publicera"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Din vägledningsgrupp är inte längre publicerad och kommer inte att vara tillgä"
 "nglig för användarna."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "Avpublicera"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "raderade"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "radera"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Din vägledning har publicerats och är nu tillgänglig för användarna."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Din vägledning är inte längre publicerad och kommer inte att vara tillgänglig "
@@ -453,19 +449,19 @@ msgstr "Det gick inte att skapa en ny version av den här mallen.<br>"
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "Uppdaterad"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -555,7 +551,7 @@ msgid "Unable to delete this version of the template."
 msgstr "Det gick inte att ta bort den här versionen av mallen."
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "kopia"
 
@@ -591,33 +587,33 @@ msgstr "Egna mallar"
 msgid "Customizable Templates"
 msgstr "Anpassningsbara mallar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "Felsökning av länkar för en %{template}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr "Mall skapad med tjänsten %{application_name}. Senast ändrad %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Det gick inte att hämta DMP-mallen för tillfället."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Inga organisationer är för närvarande registrerade."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Välj en organisation"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Din organisation verkar inte vara korrekt konfigurerad."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "Skapat med hjälp av %{application_name}. Senast ändrad %{date}"
 
@@ -654,11 +650,11 @@ msgstr "Denna plan är baserad på"
 msgid "template with customisations by the"
 msgstr "mall med anpassningar av"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "kopieras"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -666,23 +662,23 @@ msgstr ""
 "Det går inte att ändra planens status eftersom det behövs minst %{percentage} "
 "procent svarat"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "Det gick inte att hitta plan id %{plan_id}"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Ditt projekt är nu ett test."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Ditt projekt är inte längre ett test."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Kan inte ändra planens teststatus"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr "Det finns ingen plan kopplad till id %{<id}> s"
 
@@ -945,27 +941,27 @@ msgstr "Ditt konto har länkats till %{scheme}."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Det gick inte att länka ditt konto till %{scheme}."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "Framgångsrikt %{action} %{username} s konto."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "aktiverad"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "deaktiveras"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr "Kan inte %{action} %{username}"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "Aktivera"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "avaktivera"
 
@@ -1020,7 +1016,7 @@ msgid "Creators:"
 msgstr "skapare:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1147,7 +1143,7 @@ msgid "Public"
 msgstr "offentlig"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Privat"
 
@@ -1160,7 +1156,7 @@ msgid "Public: anyone can view."
 msgstr "Offentlig: alla kan visa."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Privat: begränsad till mig och personer jag bjuder in."
 
@@ -1319,75 +1315,130 @@ msgstr "Fråga"
 msgid "Answer"
 msgstr "Svar"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Anpassad av:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr "Titel:"
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr "%{title}"
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "skapare:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr "Huvudutredare:"
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr "%{investigation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr "Datumansvarig:"
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr "%{data_curation}"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr "Projektadministratör:"
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr "%{pa}"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr "Bidragsgivare:"
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr "%{other}"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Anslutning:"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "%{affiliation}"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Mall:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Bidragsnummer:"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Projektens abstrakt:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Senast ändrad:"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Upphovsrättsinformation:"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1411,12 +1462,12 @@ msgstr ""
 "amband med,\n"
 "             ditt projekt eller förslag"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Inte besvarad"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "måste anges"
 
@@ -1441,15 +1492,15 @@ msgstr "för \"Frågetekst\" kan inte vara tomt."
 msgid "You must specify at least one role."
 msgstr "Du måste ange minst en roll."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr "kan inte vara tom."
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr "kan inte vara tom om ingen e-post anges."
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr "kan inte vara tom om inget namn anges."
 
@@ -1482,11 +1533,11 @@ msgstr "redan tilldelat ett värde"
 msgid "Feedback email message"
 msgstr "Feedback e-postmeddelande"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "måste vara ett av följande format: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "kan inte vara större än 500 kB"
 
@@ -1514,7 +1565,7 @@ msgstr "måste vara efter startdatumet"
 msgid "guidance on"
 msgstr "vägledning om"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "kan inte vara mindre än noll"
 
@@ -1550,51 +1601,51 @@ msgstr "Okänd formatering inställning"
 msgid "Invalid maximum pages"
 msgstr "Ogiltiga högsta sidor"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "En historisk mall kan inte hämtas för att ändras"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! kräver ett organisationsmål"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "Kopia av %{template}"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generate_version! kräver en publicerad mall"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "skräddarsy! kräver ett organisationsmål"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "skräddarsy! kräver en mall från en funderare"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Du kan inte publicera en publicerad mall."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Du kan inte publicera en historisk version av denna mall."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Du kan inte publicera en mall utan faser."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Du kan inte publicera en mall utan sektioner i en fas."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Du kan inte publicera en mall utan frågor i en sektion."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Förhållandena i mallen hänvisar bakåt"
 
@@ -1755,11 +1806,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "måste vara efter %{date}"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "En nyckel \"org\" förväntas för länkar hash"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "En hash väntas för länkar"
@@ -1813,7 +1864,7 @@ msgstr "Vänligen vänta, Standarder laddas"
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1821,7 +1872,7 @@ msgstr "Vänligen vänta, Standarder laddas"
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1960,7 +2011,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1995,7 +2046,7 @@ msgid "Roles"
 msgstr "roller"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -2005,7 +2056,7 @@ msgstr "roller"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2018,7 +2069,7 @@ msgid "Remove"
 msgstr "ta bort"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2477,6 +2528,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "Har du ett %{application_name} konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2532,7 +2584,7 @@ msgstr ""
 "t kunna välja att visa denna undergruppsguide när de svarar på frågor i guiden"
 " \"skapa plan\"."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (t ex skola / avdelning)"
 
@@ -2677,23 +2729,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Komma igång:"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "Först"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Sista"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Nästa"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Tidigare"
 
@@ -2868,42 +2920,42 @@ msgstr "Fel:"
 msgid "Notice:"
 msgstr "Lägga märke till:"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Detta fält är obligatoriskt."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Välj en organisation från listan."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Min organisation är inte listad"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "N / A"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Dölj lista."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Se hela listan över partnerinstitut."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2911,27 +2963,27 @@ msgstr ""
 "Det gick inte att hitta en lämplig mall för forskningsorganisationen och funde"
 "raren du valt."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr "Vänligen välj en forskningsorganisation och funderare att fortsätta."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Läser in ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Det går inte att läsa in sektionens innehåll just nu."
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Det gick inte att läsa in innehållets innehåll just nu."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Öppnar i nytt fönster"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2941,45 +2993,45 @@ msgstr ""
 "örslag. Använd Enter-knappen för att välja ett förslag eller Escape-knappen fö"
 "r att stänga förslagen."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Inga resultat är tillgängliga för din post."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Söker ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr "- Ange en sökterm %{examples} -"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr "Inga resultat matchade dina filterkriterier."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr "Stänga"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr "%{topic} sökning"
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr "Använd filter"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr "Välj"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr "Klicka för att välja %{item_name}"
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr "Klicka för att ta bort %{item_name}"
 
@@ -2996,11 +3048,11 @@ msgid "Add Comment"
 msgstr "Lägg till en kommentar"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3271,7 +3323,7 @@ msgstr "Typ"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3452,7 +3504,7 @@ msgstr "Inga teman valda"
 msgid "Themed Guidance"
 msgstr "Temanvägledning"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3460,7 +3512,7 @@ msgstr ""
 "Klicka på länkarna nedan för att visa organisatorisk vägledning\n"
 "                        relaterade till teman i samband med denna fråga."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3470,7 +3522,7 @@ msgstr ""
 "            Användare har då möjlighet att dölja / visa vägledningen när man r"
 "edigerar planen."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
@@ -3478,14 +3530,14 @@ msgstr ""
 "Det finns ingen organisatorisk vägledning relaterad till teman i samband med d"
 "enna fråga."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "anteckningar"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Ingen tillhandahålls"
 
@@ -3559,7 +3611,7 @@ msgstr "Tillstånd"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3572,7 +3624,7 @@ msgstr "Publicerad"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3622,7 +3674,7 @@ msgstr "Lägg till länkar till provplaner om de tillhandahålls av fonden."
 msgid "Template details"
 msgstr "Mall detaljer"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Lägg till en ny fas"
 
@@ -3982,7 +4034,7 @@ msgid "Homepage"
 msgstr "Hemsida"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -4028,7 +4080,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "Valfri delmängd"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4037,7 +4089,7 @@ msgstr "Valfri delmängd"
 msgid "No"
 msgstr "Nej"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4046,21 +4098,21 @@ msgstr "Nej"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Avpublicera"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "publicera"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4173,14 +4225,14 @@ msgstr "Ladda ned"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -4417,79 +4469,79 @@ msgstr "Kommentarer & vägledning"
 msgid "Instructions"
 msgstr "Instruktioner"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Formatera"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "Hämta inställningar"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "Välj fas att hämta"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "Valfria plankomponenter"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "projekt detaljer täckplåt"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "Frågeformulär och rubrikrubriker"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "obesvarade frågor"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr "forskningsresultat"
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "kompletterande sektion (er) som inte begärs av finansieringsorganisationen"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "PDF-formatering"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Font"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Marginal (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Ansikte"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Storlek"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Topp"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Botten"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Vänster"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Höger"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5084,39 +5136,39 @@ msgstr "- Välj ett ämnesområde -"
 msgid "- Select a repository type -"
 msgstr "- Välj en förvarstyp -"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr "Klicka för att se arkiv relaterade till %{subject}"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr "Mer information"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr "Repository URL"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr "Datatillgång"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr "Beständig identifierartyp"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr "Policyer"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr "Uppladdning av data"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr "Typ av leverantör"
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr "Förvarstyp"
 
@@ -5186,7 +5238,7 @@ msgid "Filter plans"
 msgstr "Filter planer"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Fråga inte besvarad."
 
@@ -5195,45 +5247,41 @@ msgid "Plan Overview"
 msgstr "Planöversikt"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "En datahanteringsplan skapad med hjälp av %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
-msgstr "Titel:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Anslutning:"
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
+msgstr "Datahanterare:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Grundare:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ORCID iD:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "ID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Start datum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Slutdatum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Bidragsnummer / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5278,8 +5326,8 @@ msgstr "Kan innehålla PII?"
 msgid "Begin typing to see a list of suggestions."
 msgstr "Börja skriva för att se en lista med förslag."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5288,7 +5336,7 @@ msgstr ""
 "En ny post skapas för den organisation du har namngivit ovan. Kontrollera att "
 "din organisation inte visas i listan i något annorlunda formulär."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Namnet du angav var inte ett av de listade förslagen!"
 
@@ -6073,6 +6121,11 @@ msgstr "Slå samman konton"
 msgid "First, search for a user by email, then select them from the list."
 msgstr "Sök först efter en användare via e-post och välj sedan dem från listan."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr "standard"
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locale/tr_TR/LC_MESSAGES/app.mo b/config/locale/tr_TR/LC_MESSAGES/app.mo
index 19e92d013b5ae852eabe7e22c0d732c7ae7f2271..2e417252260283aa4f32e7345140603f52bbd90d 100644
GIT binary patch
delta 46
vcmX@r%W<lgqhSl9sRFm5fv%CMf}xp}fzfma1x8tzfQ6NT@%9V_#-wKeEeZ@T

delta 46
ucmX@r%W<lgqhSl9sRFlwiLQaUf}x?6k@<871x8tzfH6>DdxipI(lY=pv<x@^

diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po
index 6a26e100be..a4615f4392 100644
--- a/config/locale/tr_TR/app.po
+++ b/config/locale/tr_TR/app.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2022-04-07 11:27+0000\n"
-"PO-Revision-Date: 2022-04-07 13:27+0200\n"
+"POT-Creation-Date: 2022-10-25 16:02+0000\n"
+"PO-Revision-Date: 2022-10-25 18:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
@@ -135,7 +135,7 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Devam etmeden önce oturum açmanız veya kaydolmanız gerekir."
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Unable to %{action} the %{object}. {errors}"
+msgid "Unable to %{action} the %{object}. %{errors}"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:114
@@ -235,19 +235,15 @@ msgstr "search_space her birine yanıt vermiyor"
 msgid "The search space does not have elements associated"
 msgstr "Arama alanı ilişkili öğelere sahip değil"
 
-#: ../../app/controllers/contacts_controller.rb:9
-msgid "You need to be signed in to use this functionality"
-msgstr ""
-
-#: ../../app/controllers/contacts_controller.rb:15
+#: ../../app/controllers/contact_us/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha doğrulaması başarısız oldu, lütfen tekrar deneyin."
 
-#: ../../app/controllers/contacts_controller.rb:21
+#: ../../app/controllers/contact_us/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "İletişim e-postası başarıyla gönderildi."
 
-#: ../../app/controllers/contacts_controller.rb:23
+#: ../../app/controllers/contact_us/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "İsteğiniz gönderilemedi"
 
@@ -263,37 +259,37 @@ msgid "added"
 msgstr "eklendi"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:51
-#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/guidance_groups_controller.rb:55
+#: ../../app/controllers/guidances_controller.rb:75
 #: ../../app/controllers/notes_controller.rb:89
 #: ../../app/controllers/org_admin/departments_controller.rb:50
 #: ../../app/controllers/org_admin/sections_controller.rb:103
-#: ../../app/controllers/org_admin/templates_controller.rb:204
-#: ../../app/controllers/orgs_controller.rb:88
-#: ../../app/controllers/plans_controller.rb:281
-#: ../../app/controllers/plans_controller.rb:284
+#: ../../app/controllers/org_admin/templates_controller.rb:205
+#: ../../app/controllers/orgs_controller.rb:92
+#: ../../app/controllers/plans_controller.rb:280
+#: ../../app/controllers/plans_controller.rb:283
 #: ../../app/controllers/registrations_controller.rb:249
 #: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
 #: ../../app/controllers/registrations_controller.rb:284
 #: ../../app/controllers/research_outputs_controller.rb:60
-#: ../../app/controllers/users_controller.rb:101
-#: ../../app/controllers/users_controller.rb:129
+#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/users_controller.rb:131
 msgid "saved"
 msgstr "kaydedildi"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:53
-#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:57
+#: ../../app/controllers/guidances_controller.rb:77
 #: ../../app/controllers/notes_controller.rb:107
 #: ../../app/controllers/org_admin/departments_controller.rb:52
 #: ../../app/controllers/org_admin/sections_controller.rb:105
-#: ../../app/controllers/org_admin/templates_controller.rb:209
-#: ../../app/controllers/orgs_controller.rb:90
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/plans_controller.rb:293
-#: ../../app/controllers/plans_controller.rb:297
-#: ../../app/controllers/plans_controller.rb:300
+#: ../../app/controllers/org_admin/templates_controller.rb:210
+#: ../../app/controllers/orgs_controller.rb:94
+#: ../../app/controllers/plans_controller.rb:289
+#: ../../app/controllers/plans_controller.rb:292
+#: ../../app/controllers/plans_controller.rb:296
+#: ../../app/controllers/plans_controller.rb:299
 #: ../../app/controllers/registrations_controller.rb:256
 #: ../../app/controllers/registrations_controller.rb:287
 #: ../../app/controllers/research_outputs_controller.rb:63
@@ -302,7 +298,7 @@ msgstr "kaydet"
 
 #: ../../app/controllers/contributors_controller.rb:84
 #: ../../app/controllers/notes_controller.rb:131
-#: ../../app/controllers/org_admin/templates_controller.rb:237
+#: ../../app/controllers/org_admin/templates_controller.rb:238
 #: ../../app/controllers/research_outputs_controller.rb:74
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
@@ -310,7 +306,7 @@ msgstr "kaldırıldı"
 
 #: ../../app/controllers/contributors_controller.rb:87
 #: ../../app/controllers/notes_controller.rb:149
-#: ../../app/controllers/org_admin/templates_controller.rb:239
+#: ../../app/controllers/org_admin/templates_controller.rb:240
 #: ../../app/controllers/research_outputs_controller.rb:77
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
@@ -333,14 +329,14 @@ msgstr "Geri bildirim isteğiniz şu anda gönderilemiyor."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Bu plan için geri bildirim istenirken bir hata oluştu."
 
-#: ../../app/controllers/guidance_groups_controller.rb:29
-#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/guidance_groups_controller.rb:31
+#: ../../app/controllers/guidances_controller.rb:53
 #: ../../app/controllers/notes_controller.rb:48
 #: ../../app/controllers/org_admin/departments_controller.rb:26
 #: ../../app/controllers/org_admin/phases_controller.rb:121
 #: ../../app/controllers/org_admin/questions_controller.rb:94
 #: ../../app/controllers/org_admin/sections_controller.rb:79
-#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/org_admin/templates_controller.rb:181
 #: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
@@ -349,14 +345,14 @@ msgstr "Bu plan için geri bildirim istenirken bir hata oluştu."
 msgid "created"
 msgstr "oluşturuldu"
 
-#: ../../app/controllers/guidance_groups_controller.rb:32
-#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/guidance_groups_controller.rb:34
+#: ../../app/controllers/guidances_controller.rb:55
 #: ../../app/controllers/notes_controller.rb:67
 #: ../../app/controllers/org_admin/departments_controller.rb:30
 #: ../../app/controllers/org_admin/phases_controller.rb:123
 #: ../../app/controllers/org_admin/questions_controller.rb:96
 #: ../../app/controllers/org_admin/sections_controller.rb:86
-#: ../../app/controllers/org_admin/templates_controller.rb:182
+#: ../../app/controllers/org_admin/templates_controller.rb:183
 #: ../../app/controllers/plans_controller.rb:151
 #: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
@@ -365,57 +361,57 @@ msgstr "oluşturuldu"
 msgid "create"
 msgstr "oluştur"
 
-#: ../../app/controllers/guidance_groups_controller.rb:65
+#: ../../app/controllers/guidance_groups_controller.rb:69
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Rehberlik grubunuz yayınlandı ve artık kullanıma açık."
 
-#: ../../app/controllers/guidance_groups_controller.rb:68
-#: ../../app/controllers/guidances_controller.rb:112
+#: ../../app/controllers/guidance_groups_controller.rb:72
+#: ../../app/controllers/guidances_controller.rb:113
 msgid "publish"
 msgstr "yayınla"
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
+#: ../../app/controllers/guidance_groups_controller.rb:83
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr "Rehberlik grubunuz artık yayınlanmıyor ve kullanılamayacak."
 
-#: ../../app/controllers/guidance_groups_controller.rb:81
-#: ../../app/controllers/guidances_controller.rb:129
+#: ../../app/controllers/guidance_groups_controller.rb:85
+#: ../../app/controllers/guidances_controller.rb:130
 msgid "unpublish"
 msgstr "yayından kaldır"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/guidance_groups_controller.rb:95
+#: ../../app/controllers/guidances_controller.rb:94
 #: ../../app/controllers/org_admin/departments_controller.rb:66
 #: ../../app/controllers/org_admin/phases_controller.rb:179
 #: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
 #: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:343
+#: ../../app/controllers/plans_controller.rb:342
 #: ../../app/controllers/super_admin/api_clients_controller.rb:81
 #: ../../app/controllers/super_admin/notifications_controller.rb:85
 #: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "silindi"
 
-#: ../../app/controllers/guidance_groups_controller.rb:93
-#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/guidance_groups_controller.rb:97
+#: ../../app/controllers/guidances_controller.rb:96
 #: ../../app/controllers/org_admin/departments_controller.rb:68
 #: ../../app/controllers/org_admin/phases_controller.rb:181
 #: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
 #: ../../app/controllers/org_admin/sections_controller.rb:130
-#: ../../app/controllers/plans_controller.rb:348
+#: ../../app/controllers/plans_controller.rb:347
 #: ../../app/controllers/super_admin/api_clients_controller.rb:84
 #: ../../app/controllers/super_admin/notifications_controller.rb:88
 #: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "sil"
 
-#: ../../app/controllers/guidances_controller.rb:109
+#: ../../app/controllers/guidances_controller.rb:110
 msgid "Your guidance has been published and is now available to users."
 msgstr "Rehberliğiniz yayınlandı ve artık kullanıma açık."
 
-#: ../../app/controllers/guidances_controller.rb:126
+#: ../../app/controllers/guidances_controller.rb:127
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Rehberliğiniz artık yayınlanmıyor ve kullanılamayacak."
 
@@ -447,19 +443,19 @@ msgstr ""
 #: ../../app/controllers/org_admin/phases_controller.rb:147
 #: ../../app/controllers/org_admin/questions_controller.rb:166
 #: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:416
+#: ../../app/controllers/plans_controller.rb:415
 #: ../../app/controllers/super_admin/api_clients_controller.rb:68
 #: ../../app/controllers/super_admin/notifications_controller.rb:52
 #: ../../app/controllers/super_admin/themes_controller.rb:39
 #: ../../app/controllers/super_admin/users_controller.rb:54
-#: ../../app/controllers/users_controller.rb:106
+#: ../../app/controllers/users_controller.rb:108
 msgid "updated"
 msgstr "güncellendi"
 
 #: ../../app/controllers/org_admin/phases_controller.rb:149
 #: ../../app/controllers/org_admin/questions_controller.rb:169
 #: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:419
+#: ../../app/controllers/plans_controller.rb:418
 #: ../../app/controllers/super_admin/api_clients_controller.rb:70
 #: ../../app/controllers/super_admin/notifications_controller.rb:55
 #: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -549,7 +545,7 @@ msgid "Unable to delete this version of the template."
 msgstr ""
 
 #: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:395
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copy"
 msgstr "kopyala"
 
@@ -585,35 +581,35 @@ msgstr "Kendi Şablonları"
 msgid "Customizable Templates"
 msgstr "Özelleştirilebilir Şablonlar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:215
+#: ../../app/controllers/org_admin/templates_controller.rb:216
 msgid "Error parsing links for a %{template}"
 msgstr "%{template} için bağlantılar ayrıştırılırken hata oluştu"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/org_admin/templates_controller.rb:344
 #: ../../app/controllers/public_pages_controller.rb:67
 msgid "Template created using the %{application_name} service. Last modified %{date}"
 msgstr ""
 "Şablon %{application_name} hizmeti kullanılarak oluşturuldu. Son değiştirilme:"
 " %{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/org_admin/templates_controller.rb:356
 #: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "VYP Şablonu şu anda indirilemiyor."
 
-#: ../../app/controllers/orgs_controller.rb:116
+#: ../../app/controllers/orgs_controller.rb:120
 msgid "No organisations are currently registered."
 msgstr "Şu anda kayıtlı hiçbir kuruluş yok."
 
-#: ../../app/controllers/orgs_controller.rb:127
+#: ../../app/controllers/orgs_controller.rb:131
 msgid "Please choose an organisation"
 msgstr "Lütfen bir kuruluş seçin"
 
-#: ../../app/controllers/orgs_controller.rb:136
+#: ../../app/controllers/orgs_controller.rb:140
 msgid "Your organisation does not seem to be properly configured."
 msgstr "Kuruluşunuz düzgün yapılandırılmamış gibi görünüyor."
 
-#: ../../app/controllers/plan_exports_controller.rb:89
+#: ../../app/controllers/plan_exports_controller.rb:99
 msgid "Created using %{application_name}. Last modified %{date}"
 msgstr "%{application_name} kullanılarak oluşturuldu. Son değiştirildiği tarih %{date}"
 
@@ -650,11 +646,11 @@ msgstr "Bu plan şunlara dayanmaktadır:"
 msgid "template with customisations by the"
 msgstr "şu kişi tarafından özelleştirmeler içeren şablon:"
 
-#: ../../app/controllers/plans_controller.rb:393
+#: ../../app/controllers/plans_controller.rb:392
 msgid "copied"
 msgstr "kopyalandı"
 
-#: ../../app/controllers/plans_controller.rb:424
+#: ../../app/controllers/plans_controller.rb:423
 msgid ""
 "Unable to change the plan's status since it is needed at least %{percentage} p"
 "ercentage responded"
@@ -662,23 +658,23 @@ msgstr ""
 "En az yüzde %{percentage} yanıt verilmesi gerektiğinden planın durumu değiştir"
 "ilemiyor"
 
-#: ../../app/controllers/plans_controller.rb:430
+#: ../../app/controllers/plans_controller.rb:429
 msgid "Unable to find plan id %{plan_id}"
 msgstr "%{plan_id} no.'lu plan bulunamadı"
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is now a test."
 msgstr "Projeniz şu an bir test."
 
-#: ../../app/controllers/plans_controller.rb:445
+#: ../../app/controllers/plans_controller.rb:444
 msgid "Your project is no longer a test."
 msgstr "Projeniz artık bir test değil."
 
-#: ../../app/controllers/plans_controller.rb:449
+#: ../../app/controllers/plans_controller.rb:448
 msgid "Unable to change the plan's test status"
 msgstr "Planın test durumu değiştirilemiyor"
 
-#: ../../app/controllers/plans_controller.rb:462
+#: ../../app/controllers/plans_controller.rb:461
 msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
@@ -936,27 +932,27 @@ msgstr "Hesabınız başarıyla %{scheme} şemasına bağlandı."
 msgid "Unable to link your account to %{scheme}."
 msgstr "Hesabınız %{scheme} şemasına bağlanamadı."
 
-#: ../../app/controllers/users_controller.rb:147
+#: ../../app/controllers/users_controller.rb:149
 msgid "Successfully %{action} %{username}'s account."
 msgstr "%{username} adlı kullanıcının hesabı başarıyla %{action}."
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "activated"
 msgstr "etkinleştirildi"
 
-#: ../../app/controllers/users_controller.rb:148
+#: ../../app/controllers/users_controller.rb:150
 msgid "deactivated"
 msgstr "devre dışı bırakıldı"
 
-#: ../../app/controllers/users_controller.rb:154
+#: ../../app/controllers/users_controller.rb:156
 msgid "Unable to %{action} %{username}"
 msgstr " %{username} %{action} yapılamıyor"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "activate"
 msgstr "etkinleştir"
 
-#: ../../app/controllers/users_controller.rb:155
+#: ../../app/controllers/users_controller.rb:157
 msgid "deactivate"
 msgstr "devre dışı bırak"
 
@@ -1012,7 +1008,7 @@ msgid "Creators:"
 msgstr "Oluşturanlar:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/models/concerns/exportable_plan.rb:147
 #: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
@@ -1139,7 +1135,7 @@ msgid "Public"
 msgstr "Herkese Açık"
 
 #: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
 msgid "Private"
 msgstr "Özel"
 
@@ -1152,7 +1148,7 @@ msgid "Public: anyone can view."
 msgstr "Herkese açık: herkes görüntüleyebilir."
 
 #: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
 msgid "Private: restricted to me and people I invite."
 msgstr "Özel: benimle ve davet ettiğim kişilerle sınırlı."
 
@@ -1311,75 +1307,130 @@ msgstr "Soru"
 msgid "Answer"
 msgstr "Cevap"
 
-#: ../../app/models/concerns/exportable_plan.rb:128
+#: ../../app/models/concerns/exportable_plan.rb:134
 msgid " Customised By: "
 msgstr " Özelleştiren:"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
+msgid "Title: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:143
+msgid "%{title}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Oluşturanlar:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%{authors}"
 msgstr "%{authors}"
 
-#: ../../app/models/concerns/exportable_plan.rb:143
+#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
+#: ../../app/views/shared/export/_plan_txt.erb:9
+msgid "Principal Investigator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:151
+msgid "%{investigation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:154
+msgid "Date Manager: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:155
+msgid "%{data_curation}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
+#: ../../app/views/shared/export/_plan_txt.erb:15
+msgid "Project Administrator: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:158
+msgid "%{pa}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+#: ../../app/views/shared/export/_plan_coversheet.erb:23
+#: ../../app/views/shared/export/_plan_txt.erb:18
+msgid "Contributor: "
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:161
+msgid "%{other}"
+msgstr ""
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/views/shared/export/_plan_txt.erb:20
+msgid "Affiliation: "
+msgstr "Bağlı olunan kurum/kuruluş:"
+
+#: ../../app/models/concerns/exportable_plan.rb:163
+#: ../../app/models/concerns/exportable_plan.rb:164
 msgid "%{affiliation}"
 msgstr "Bağlı olunan kurum/kuruluş:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/models/concerns/exportable_plan.rb:147
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
-#: ../../app/views/shared/export/_plan_txt.erb:7
-#: ../../app/views/shared/export/_plan_txt.erb:9
+#: ../../app/models/concerns/exportable_plan.rb:166
+#: ../../app/models/concerns/exportable_plan.rb:168
+#: ../../app/views/shared/export/_plan_coversheet.erb:32
+#: ../../app/views/shared/export/_plan_txt.erb:22
+#: ../../app/views/shared/export/_plan_txt.erb:24
 msgid "Template: "
 msgstr "Şablon:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:166
 msgid "%{funder}"
 msgstr "%{funder}"
 
-#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/models/concerns/exportable_plan.rb:168
 msgid "%{template}"
 msgstr "%{template}"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_txt.erb:12
+#: ../../app/models/concerns/exportable_plan.rb:170
+#: ../../app/views/shared/export/_plan_txt.erb:27
 msgid "Grant number: "
 msgstr "Fon/hibe numarası:"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
+#: ../../app/models/concerns/exportable_plan.rb:170
 msgid "%{grant_number}"
 msgstr "%{grant_number}"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
-#: ../../app/views/shared/export/_plan_txt.erb:15
+#: ../../app/models/concerns/exportable_plan.rb:172
+#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/views/shared/export/_plan_txt.erb:30
 msgid "Project abstract: "
 msgstr "Proje özeti:"
 
-#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/models/concerns/exportable_plan.rb:172
 msgid "%{description}"
 msgstr "%{description}"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
-#: ../../app/views/shared/export/_plan_txt.erb:18
+#: ../../app/models/concerns/exportable_plan.rb:174
+#: ../../app/views/shared/export/_plan_coversheet.erb:58
+#: ../../app/views/shared/export/_plan_txt.erb:33
 msgid "Last modified: "
 msgstr "Son düzenleme:"
 
-#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/models/concerns/exportable_plan.rb:174
 msgid "%{date}"
 msgstr "%{date}"
 
-#: ../../app/models/concerns/exportable_plan.rb:154
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
-#: ../../app/views/shared/export/_plan_txt.erb:19
+#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/views/shared/export/_plan_coversheet.erb:65
+#: ../../app/views/shared/export/_plan_txt.erb:34
 msgid "Copyright information:"
 msgstr "Telif hakkı bilgileri:"
 
-#: ../../app/models/concerns/exportable_plan.rb:155
+#: ../../app/models/concerns/exportable_plan.rb:176
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1399,12 +1450,12 @@ msgstr ""
 "anız, planı oluşturan(lar)ın sizin projenizi veya önerinizi onayladığı veya bu"
 "nlarla herhangi bir ilişkisi olduğu anlamına gelmez"
 
-#: ../../app/models/concerns/exportable_plan.rb:179
+#: ../../app/models/concerns/exportable_plan.rb:199
 msgid "Not Answered"
 msgstr "Cevaplanmadı"
 
 #: ../../app/models/concerns/validation_messages.rb:11
-#: ../../app/models/template.rb:221
+#: ../../app/models/template.rb:226
 msgid "can't be blank"
 msgstr "boş bırakılamaz"
 
@@ -1429,15 +1480,15 @@ msgstr "'Soru metni' için boş olamaz."
 msgid "You must specify at least one role."
 msgstr "En az bir rol belirtmelisiniz."
 
-#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+#: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135
 msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:142
+#: ../../app/models/contributor.rb:139
 msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:143
+#: ../../app/models/contributor.rb:140
 msgid "can't be blank if no name is provided."
 msgstr ""
 
@@ -1470,11 +1521,11 @@ msgstr "zaten bir değer atanmış"
 msgid "Feedback email message"
 msgstr "Geri bildirim e-posta iletisi"
 
-#: ../../app/models/org.rb:122
+#: ../../app/models/org.rb:123
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "şu biçimlerden biri olmalıdır: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:127
+#: ../../app/models/org.rb:128
 msgid "can't be larger than 500KB"
 msgstr "500KB'den büyük olamaz"
 
@@ -1502,7 +1553,7 @@ msgstr "başlangıç tarihinden sonra olmalıdır"
 msgid "guidance on"
 msgstr "rehberlik açık"
 
-#: ../../app/models/role.rb:63
+#: ../../app/models/role.rb:64
 msgid "can't be less than zero"
 msgstr "sıfırdan küçük olamaz"
 
@@ -1538,51 +1589,51 @@ msgstr "Bilinmeyen biçimlendirme ayarı"
 msgid "Invalid maximum pages"
 msgstr "Geçersiz maksimum sayfa sayısı"
 
-#: ../../app/models/template.rb:249
+#: ../../app/models/template.rb:254
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Tarihsel bir şablon değiştirilmek üzere çekilemiyor"
 
-#: ../../app/models/template.rb:373
+#: ../../app/models/template.rb:378
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! bir kuruluş hedefi gerektirir"
 
-#: ../../app/models/template.rb:382
+#: ../../app/models/template.rb:387
 msgid "Copy of %{template}"
 msgstr "%{template} şablonunun kopyası"
 
-#: ../../app/models/template.rb:389
+#: ../../app/models/template.rb:394
 msgid "generate_version! requires a published template"
 msgstr "generate_version! yayınlanmış bir şablon gerektirir"
 
-#: ../../app/models/template.rb:403
+#: ../../app/models/template.rb:408
 msgid "customize! requires an organisation target"
 msgstr "customize! bir kuruluş hedefi gerektirir"
 
-#: ../../app/models/template.rb:406
+#: ../../app/models/template.rb:411
 msgid "customize! requires a template from a funder"
 msgstr "customize! bir fon sağlayıcıdan bir şablon gerektirir"
 
-#: ../../app/models/template.rb:442
+#: ../../app/models/template.rb:447
 msgid "You can not publish a published template.  "
 msgstr "Yayınlanmış bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:451
 msgid "You can not publish a historical version of this template.  "
 msgstr "Bu şablonun geçmiş bir sürümünü yayınlayamazsınız."
 
-#: ../../app/models/template.rb:451
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without phases.  "
 msgstr "Aşamaları olmayan bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:456
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Bir aşamasında bölüm yer almayan bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:461
+#: ../../app/models/template.rb:466
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Bir bölümünde soru bulunmayan bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:470
 msgid "Conditions in the template refer backwards"
 msgstr "Şablondaki koşullar geriye dönük"
 
@@ -1743,11 +1794,11 @@ msgstr ""
 msgid "must be after %{date}"
 msgstr "%{date} tarihinden sonra olmalıdır"
 
-#: ../../app/validators/org_links_validator.rb:10
+#: ../../app/validators/org_links_validator.rb:11
 msgid "A key \"org\" is expected for links hash"
 msgstr "Bağlantı hash'i için bir anahtar \"org\" bekleniyor"
 
-#: ../../app/validators/org_links_validator.rb:13
+#: ../../app/validators/org_links_validator.rb:14
 #: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Bağlantılar için bir hash bekleniyor"
@@ -1801,7 +1852,7 @@ msgstr "Lütfen bekleyin, Standartlar yükleniyor"
 #: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:28
 #: ../../app/views/guidances/new_edit.html.erb:49
 #: ../../app/views/notes/_edit.html.erb:10
 #: ../../app/views/notes/_new.html.erb:13
@@ -1809,7 +1860,7 @@ msgstr "Lütfen bekleyin, Standartlar yükleniyor"
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
 #: ../../app/views/org_admin/questions/_form.html.erb:99
-#: ../../app/views/org_admin/questions/_show.html.erb:208
+#: ../../app/views/org_admin/questions/_show.html.erb:209
 #: ../../app/views/org_admin/sections/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_form.html.erb:82
 #: ../../app/views/org_admin/users/edit.html.erb:54
@@ -1949,7 +2000,7 @@ msgstr ""
 #: ../../app/views/paginable/templates/_organisational.html.erb:85
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:29
 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:36
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 #: ../../app/views/static_pages/about_us.html.erb:22
 #: ../../app/views/static_pages/about_us.html.erb:29
 #: ../../app/views/static_pages/termsuse.html.erb:46
@@ -1984,7 +2035,7 @@ msgid "Roles"
 msgstr "Roller"
 
 #: ../../app/views/contributors/_form.html.erb:96
-#: ../../app/views/layouts/modal_search/_result.html.erb:12
+#: ../../app/views/layouts/modal_search/_result.html.erb:23
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1994,7 +2045,7 @@ msgstr "Roller"
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 #: ../../app/views/paginable/contributors/_index.html.erb:55
 #: ../../app/views/paginable/departments/_index.html.erb:28
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 #: ../../app/views/paginable/guidances/_index.html.erb:61
 #: ../../app/views/paginable/orgs/_index.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:75
@@ -2007,7 +2058,7 @@ msgid "Remove"
 msgstr "Kaldır"
 
 #: ../../app/views/contributors/_form.html.erb:99
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:29
 #: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
 #: ../../app/views/notes/_edit.html.erb:11
@@ -2472,6 +2523,7 @@ msgid "Do you have a %{application_name} account?"
 msgstr "%{application_name} hesabınız var mı?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
+#: ../../app/views/layouts/_navigation.html.erb:63
 #: ../../app/views/layouts/_signin_signout.html.erb:41
 #: ../../app/views/shared/_access_controls.html.erb:5
 #: ../../app/views/shared/_sign_in_form.html.erb:19
@@ -2529,7 +2581,7 @@ msgstr ""
 "urma' sihirbazındaki soruları yanıtlarken bu alt küme kılavuzunu görüntülemeyi"
 " seçebileceklerdir."
 
-#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:19
+#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:21
 msgid " (e.g. School/ Department) "
 msgstr " (ör. Üniversite/Bölüm)"
 
@@ -2673,23 +2725,23 @@ msgstr ""
 msgid "Getting started:"
 msgstr "Başlarken:"
 
-#: ../../app/views/kaminari/_first_page.html.erb:3
+#: ../../app/views/kaminari/_first_page.html.erb:10
 msgid "First"
 msgstr "İlk"
 
-#: ../../app/views/kaminari/_gap.html.erb:2
+#: ../../app/views/kaminari/_gap.html.erb:8
 msgid "..."
 msgstr "..."
 
-#: ../../app/views/kaminari/_last_page.html.erb:3
+#: ../../app/views/kaminari/_last_page.html.erb:10
 msgid "Last"
 msgstr "Son"
 
-#: ../../app/views/kaminari/_next_page.html.erb:3
+#: ../../app/views/kaminari/_next_page.html.erb:10
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../../app/views/kaminari/_prev_page.html.erb:3
+#: ../../app/views/kaminari/_prev_page.html.erb:10
 msgid "Previous"
 msgstr "Önceki"
 
@@ -2864,42 +2916,42 @@ msgstr "Hata:"
 msgid "Notice:"
 msgstr "Bildiri:"
 
-#: ../../app/views/layouts/application.html.erb:101
+#: ../../app/views/layouts/application.html.erb:102
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
 #: ../../app/views/plans/new.html.erb:2
 msgid "This field is required."
 msgstr "Bu alan zorunludur."
 
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
 #: ../../app/views/shared/_create_account_form.html.erb:31
 msgid "Show password"
 msgstr "Şifreyi göster"
 
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
 msgid "Select an organisation from the list."
 msgstr "Listeden bir kuruluş seçin."
 
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
 msgid "My organisation isn't listed"
 msgstr "Kuruluşum listelenmedi"
 
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:39
 msgid "N/A"
 msgstr "Erişilebilir değil"
 
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
 msgid "Hide list."
 msgstr "Listeyi gizle."
 
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
 msgid "See the full list of partner institutions."
 msgstr "Ortak kurumların tam listesine bakın."
 
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
 msgid ""
 "Unable to find a suitable template for the research organisation and funder yo"
 "u selected."
@@ -2907,27 +2959,27 @@ msgstr ""
 "Seçtiğiniz araştırma kuruluşu ve fon sağlayıcı için uygun bir şablon bulunamad"
 "ı."
 
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
 msgid "Please select a research organisation and funder to continue."
 msgstr "Devam etmek için lütfen bir araştırma kuruluşu ve fon sağlayıcı seçin."
 
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
 msgid "Loading ..."
 msgstr "Yükleniyor ..."
 
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
 msgid "Unable to load the section's content at this time."
 msgstr "Bölümün içeriği şu anda yüklenemiyor"
 
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
 msgid "Unable to load the question's content at this time."
 msgstr "Sorunun içeriği şu anda yüklenemiyor."
 
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
 msgid "Opens in a new window"
 msgstr "Yeni bir pencerede açılır"
 
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
 msgid ""
 "%{n} results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -2937,45 +2989,45 @@ msgstr ""
 " Bir öneri seçmek için Enter tuşunu veya önerileri kapatmak için Çıkış tuşunu "
 "kullanın."
 
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
 msgid "No results are available for your entry."
 msgstr "Girişiniz için sonuç bulunamadı."
 
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
 msgid "Searching ..."
 msgstr "Aranıyor ..."
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:7
+#: ../../app/views/layouts/modal_search/_form.html.erb:24
 msgid "- Enter a search term %{examples} -"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:8
-#: ../../app/views/layouts/modal_search/_results.html.erb:6
+#: ../../app/views/layouts/modal_search/_form.html.erb:25
+#: ../../app/views/layouts/modal_search/_results.html.erb:20
 msgid "No results matched your filter criteria."
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:24
-#: ../../app/views/layouts/modal_search/_form.html.erb:66
+#: ../../app/views/layouts/modal_search/_form.html.erb:41
+#: ../../app/views/layouts/modal_search/_form.html.erb:83
 msgid "Close"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:27
+#: ../../app/views/layouts/modal_search/_form.html.erb:44
 msgid "%{topic} search"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_form.html.erb:49
+#: ../../app/views/layouts/modal_search/_form.html.erb:66
 msgid "Apply filter(s)"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:9
+#: ../../app/views/layouts/modal_search/_result.html.erb:20
 msgid "Select"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:11
+#: ../../app/views/layouts/modal_search/_result.html.erb:22
 msgid "Click to select %{item_name}"
 msgstr ""
 
-#: ../../app/views/layouts/modal_search/_result.html.erb:14
+#: ../../app/views/layouts/modal_search/_result.html.erb:25
 msgid "Click to remove %{item_name}"
 msgstr ""
 
@@ -2992,11 +3044,11 @@ msgid "Add Comment"
 msgstr "Yorum ekle"
 
 #: ../../app/views/notes/_list.html.erb:15
-#: ../../app/views/org_admin/questions/_show.html.erb:217
+#: ../../app/views/org_admin/questions/_show.html.erb:218
 #: ../../app/views/paginable/api_clients/_index.html.erb:43
 #: ../../app/views/paginable/contributors/_index.html.erb:53
 #: ../../app/views/paginable/departments/_index.html.erb:27
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:44
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:49
 #: ../../app/views/paginable/guidances/_index.html.erb:54
 #: ../../app/views/paginable/orgs/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:58
@@ -3268,7 +3320,7 @@ msgstr "Tür"
 #: ../../app/views/paginable/departments/_index.html.erb:7
 #: ../../app/views/paginable/departments/_index.html.erb:24
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:41
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
 #: ../../app/views/paginable/guidances/_index.html.erb:11
 #: ../../app/views/paginable/guidances/_index.html.erb:51
 #: ../../app/views/paginable/orgs/_index.html.erb:10
@@ -3450,7 +3502,7 @@ msgstr "Tema seçilmedi"
 msgid "Themed Guidance"
 msgstr "Temalı Rehberlik"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:111
+#: ../../app/views/org_admin/questions/_show.html.erb:118
 msgid ""
 "Click the links below to view organisational guidance\n"
 "                        related to the themes associated with this question."
@@ -3458,7 +3510,7 @@ msgstr ""
 "Bu soruya ilişkili temalarla bağlantılı kurumsal kılavuzu görüntülemek için aş"
 "ağıdaki bağlantılara tıklayın."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:168
+#: ../../app/views/org_admin/questions/_show.html.erb:169
 msgid ""
 "Note: New plans will automatically display this guidance.\n"
 "            Users then have the ability to hide/display the guidance when edit"
@@ -3468,20 +3520,20 @@ msgstr ""
 "            Kullanıcılar daha sonra planlarını düzenlerken rehberi gizleme/gör"
 "üntüleme olanağına sahip olurlar."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:171
+#: ../../app/views/org_admin/questions/_show.html.erb:172
 msgid ""
 "There is no organisational guidance related to the themes associated with this"
 " question."
 msgstr "Bu soruyla ilişkili temalara yönelik herhangi bir kurumsal rehber yoktur."
 
-#: ../../app/views/org_admin/questions/_show.html.erb:181
-#: ../../app/views/org_admin/questions/_show.html.erb:193
-#: ../../app/views/org_admin/questions/_show.html.erb:223
+#: ../../app/views/org_admin/questions/_show.html.erb:182
+#: ../../app/views/org_admin/questions/_show.html.erb:194
+#: ../../app/views/org_admin/questions/_show.html.erb:224
 msgid "Annotations"
 msgstr "Ek açıklamalar"
 
-#: ../../app/views/org_admin/questions/_show.html.erb:187
-#: ../../app/views/org_admin/questions/_show.html.erb:229
+#: ../../app/views/org_admin/questions/_show.html.erb:188
+#: ../../app/views/org_admin/questions/_show.html.erb:230
 msgid "None provided"
 msgstr "Hiçbiri sağlanmadı"
 
@@ -3555,7 +3607,7 @@ msgstr "Durum"
 #: ../../app/views/org_admin/templates/_row.html.erb:13
 #: ../../app/views/org_admin/templates/_show.html.erb:19
 #: ../../app/views/org_admin/templates/_show.html.erb:22
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:21
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
 #: ../../app/views/paginable/guidances/_index.html.erb:37
 #: ../../app/views/paginable/templates/_customisable.html.erb:31
 #: ../../app/views/paginable/templates/_customisable.html.erb:34
@@ -3568,7 +3620,7 @@ msgstr "Yayınlandı"
 #: ../../app/views/org_admin/templates/_form.html.erb:37
 #: ../../app/views/org_admin/templates/_row.html.erb:16
 #: ../../app/views/org_admin/templates/_show.html.erb:26
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:19
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
 #: ../../app/views/paginable/guidances/_index.html.erb:35
 #: ../../app/views/paginable/templates/_customisable.html.erb:37
 #: ../../app/views/paginable/templates/_organisational.html.erb:42
@@ -3618,7 +3670,7 @@ msgstr "Fon sağlayıcı tarafından sunuluyorsa, örnek planlara bağlantı ekl
 msgid "Template details"
 msgstr "Şablon ayrıntıları"
 
-#: ../../app/views/org_admin/templates/_navigation.html.erb:14
+#: ../../app/views/org_admin/templates/_navigation.html.erb:15
 msgid "Add new phase"
 msgstr "Yeni aşama ekle"
 
@@ -3980,7 +4032,7 @@ msgid "Homepage"
 msgstr "Ana Sayfa"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:40
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
 msgid "Contact"
 msgstr "İletişim"
 
@@ -4026,7 +4078,7 @@ msgstr ""
 msgid "Optional subset"
 msgstr "İsteğe bağlı alt küme"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:26
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:31
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:45
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4035,7 +4087,7 @@ msgstr "İsteğe bağlı alt küme"
 msgid "No"
 msgstr "Yok"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:28
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:33
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:35
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:43
 #: ../../app/views/paginable/templates/_history.html.erb:42
@@ -4044,21 +4096,21 @@ msgstr "Yok"
 msgid "Yes"
 msgstr "Evet"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:46
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:51
 #: ../../app/views/paginable/guidances/_index.html.erb:57
 #: ../../app/views/paginable/templates/_customisable.html.erb:58
 #: ../../app/views/paginable/templates/_organisational.html.erb:59
 msgid "Unpublish"
 msgstr "Yayından kaldır"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:48
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:53
 #: ../../app/views/paginable/guidances/_index.html.erb:59
 #: ../../app/views/paginable/templates/_customisable.html.erb:63
 #: ../../app/views/paginable/templates/_organisational.html.erb:64
 msgid "Publish"
 msgstr "Yayınla"
 
-#: ../../app/views/paginable/guidance_groups/_index.html.erb:50
+#: ../../app/views/paginable/guidance_groups/_index.html.erb:56
 msgid ""
 "You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
@@ -4170,14 +4222,14 @@ msgstr "İndir"
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:31
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:18
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:45
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:50
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:53
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:58
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:67
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:72
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:75
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:47
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:60
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:68
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:69
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:77
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
@@ -4413,79 +4465,79 @@ msgstr ""
 msgid "Instructions"
 msgstr "Talimatlar"
 
-#: ../../app/views/plans/_download_form.html.erb:3
+#: ../../app/views/plans/_download_form.html.erb:6
 msgid "Format"
 msgstr "Biçim"
 
-#: ../../app/views/plans/_download_form.html.erb:12
+#: ../../app/views/plans/_download_form.html.erb:15
 msgid "Download settings"
 msgstr "İndirme ayarları"
 
-#: ../../app/views/plans/_download_form.html.erb:16
+#: ../../app/views/plans/_download_form.html.erb:19
 msgid "Select phase to download"
 msgstr "İndirilecek aşamayı seçin"
 
-#: ../../app/views/plans/_download_form.html.erb:23
+#: ../../app/views/plans/_download_form.html.erb:26
 msgid "Optional plan components"
 msgstr "İsteğe bağlı plan bileşenleri"
 
-#: ../../app/views/plans/_download_form.html.erb:27
+#: ../../app/views/plans/_download_form.html.erb:30
 msgid "project details coversheet"
 msgstr "proje detayları kapak sayfası"
 
-#: ../../app/views/plans/_download_form.html.erb:33
+#: ../../app/views/plans/_download_form.html.erb:36
 msgid "question text and section headings"
 msgstr "soru metni ve bölüm başlıkları"
 
-#: ../../app/views/plans/_download_form.html.erb:39
+#: ../../app/views/plans/_download_form.html.erb:42
 msgid "unanswered questions"
 msgstr "cevaplanmamış sorular"
 
-#: ../../app/views/plans/_download_form.html.erb:46
+#: ../../app/views/plans/_download_form.html.erb:49
 msgid "research outputs"
 msgstr ""
 
-#: ../../app/views/plans/_download_form.html.erb:54
+#: ../../app/views/plans/_download_form.html.erb:57
 msgid "supplementary section(s) not requested by funding organisation"
 msgstr "Fon sağlayıcı kurum tarafından talep edilmeyen ek bölüm(ler)"
 
-#: ../../app/views/plans/_download_form.html.erb:62
+#: ../../app/views/plans/_download_form.html.erb:65
 msgid "PDF formatting"
 msgstr "PDF biçimlendirme"
 
-#: ../../app/views/plans/_download_form.html.erb:65
+#: ../../app/views/plans/_download_form.html.erb:68
 msgid "Font"
 msgstr "Yazı tipi"
 
-#: ../../app/views/plans/_download_form.html.erb:68
+#: ../../app/views/plans/_download_form.html.erb:71
 msgid "Margin (mm)"
 msgstr "Kenar boşluğu (mm)"
 
-#: ../../app/views/plans/_download_form.html.erb:73
+#: ../../app/views/plans/_download_form.html.erb:76
 msgid "Face"
 msgstr "Yüz"
 
-#: ../../app/views/plans/_download_form.html.erb:81
+#: ../../app/views/plans/_download_form.html.erb:84
 msgid "Size"
 msgstr "Boyut"
 
-#: ../../app/views/plans/_download_form.html.erb:89
+#: ../../app/views/plans/_download_form.html.erb:92
 msgid "Top"
 msgstr "Üst"
 
-#: ../../app/views/plans/_download_form.html.erb:98
+#: ../../app/views/plans/_download_form.html.erb:101
 msgid "Bottom"
 msgstr "Alt"
 
-#: ../../app/views/plans/_download_form.html.erb:107
+#: ../../app/views/plans/_download_form.html.erb:110
 msgid "Left"
 msgstr "Kalan"
 
-#: ../../app/views/plans/_download_form.html.erb:116
+#: ../../app/views/plans/_download_form.html.erb:119
 msgid "Right"
 msgstr "Yetki"
 
-#: ../../app/views/plans/_download_form.html.erb:127
+#: ../../app/views/plans/_download_form.html.erb:130
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
 "up-info\">%{open_in_new_window_text}</span>"
@@ -5066,39 +5118,39 @@ msgstr ""
 msgid "- Select a repository type -"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:18
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:20
 msgid "Click to view repositories related to %{subject}"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:30
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:32
 msgid "More info"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:35
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:37
 msgid "Repository URL"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:49
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:51
 msgid "Data access"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:52
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:54
 msgid "Persistent identifier type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:55
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:57
 msgid "Policies"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:64
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:66
 msgid "Data upload"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:71
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:73
 msgid "Provider type"
 msgstr ""
 
-#: ../../app/views/research_outputs/repositories/_search_result.html.erb:74
+#: ../../app/views/research_outputs/repositories/_search_result.html.erb:76
 msgid "Repository type"
 msgstr ""
 
@@ -5168,7 +5220,7 @@ msgid "Filter plans"
 msgstr "Planları filtrele"
 
 #: ../../app/views/shared/export/_plan.erb:55
-#: ../../app/views/shared/export/_plan_txt.erb:52
+#: ../../app/views/shared/export/_plan_txt.erb:67
 msgid "Question not answered."
 msgstr "Soru cevaplanmadı."
 
@@ -5177,45 +5229,41 @@ msgid "Plan Overview"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:67
+#: ../../app/views/shared/export/_plan_txt.erb:82
 msgid "A Data Management Plan created using %{application_name}"
 msgstr "%{application_name} kullanılarak oluşturulan bir Veri Yönetim Planı"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:6
-msgid "Title: "
+#: ../../app/views/shared/export/_plan_coversheet.erb:17
+#: ../../app/views/shared/export/_plan_txt.erb:12
+msgid "Data Manager: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
-#: ../../app/views/shared/export/_plan_txt.erb:5
-msgid "Affiliation: "
-msgstr "Bağlı olunan kurum/kuruluş:"
-
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "Funder: "
 msgstr "Fon Sağlayıcı:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:38
 msgid "ORCID iD: "
 msgstr "ORCID hesabı:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 msgid "ID: "
 msgstr "ID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:51
 msgid "Start date: "
 msgstr "Başlangıç tarihi: "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:55
 msgid "End date: "
 msgstr "Bitiş tarihi:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:61
 msgid "Grant number / URL: "
 msgstr "Fon/hibe numarası (grant number) / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
-#: ../../app/views/shared/export/_plan_txt.erb:20
+#: ../../app/views/shared/export/_plan_coversheet.erb:68
+#: ../../app/views/shared/export/_plan_txt.erb:35
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
 " of this plan as they would like in their own plans, and customise it as neces"
@@ -5260,8 +5308,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Öneri listesini görmek için yazmaya başlayın."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:48
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
+#: ../../app/views/shared/org_selectors/_combined.html.erb:50
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:45
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -5271,7 +5319,7 @@ msgstr ""
 "kuruluşunuzun listede daha farklı bir biçimde görünmediğini tekrar kontrol edi"
 "n."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Girdiğiniz ad, listelenen önerilerden biri değil!"
 
@@ -6019,6 +6067,11 @@ msgstr "Hesapları Birleştir"
 msgid "First, search for a user by email, then select them from the list."
 msgstr "Önce, bir kullanıcıyı e-posta ile aratın, sonra listeden seçin."
 
+#: ../../app/views/template_exports/template_export.docx.erb:29
+#: ../../app/views/template_exports/template_export.pdf.erb:73
+msgid "default"
+msgstr ""
+
 #: ../../app/views/template_exports/template_export.docx.erb:39
 #: ../../app/views/template_exports/template_export.pdf.erb:81
 msgid "Example Answer"
diff --git a/config/locales/.translation_io b/config/locales/.translation_io
index ad80074937..1ce07b9c49 100644
--- a/config/locales/.translation_io
+++ b/config/locales/.translation_io
@@ -5,4 +5,4 @@
 # ignore the conflicts and "sync" again, it will fix this file for you.
 
 ---
-timestamp: 1649330852
+timestamp: 1666713759
diff --git a/config/locales/translation.de.yml b/config/locales/translation.de.yml
index 2c79e49ded..7281133b2a 100644
--- a/config/locales/translation.de.yml
+++ b/config/locales/translation.de.yml
@@ -117,6 +117,15 @@ de:
           konnte:"
       model_invalid: 'Gültigkeitsprüfung ist fehlgeschlagen: %{errors}'
       required: muss ausgefüllt werden
+    unavailable_session: "Session %{id} ist nicht mehr im Arbeitsspeicher verfügbar.
+      \n\nSollte Ihr System auf einem Multi-Process-Server (wie Unicorn oder Puma)
+      laufen, dann speichert der Prozess, den diese Anfrage ansteuert, keine %{id}
+      im Arbeitspeicher. Sie sollten die Anzahl der Prozesse/Arbeiter auf eins (1)
+      setzen oder einen anderen Server für die Entwicklung verwenden."
+    unacceptable_request: " Im Accept-Header wird eine unterstützte Version erwartet."
+    connection_refused: |-
+      Ups! Konnte keine Verbindung zur Web-Console-Middleware herstellen.
+      Bitte stellen Sie sicher, dass ein Rails-Development-Server läuft.
     template:
       body: 'Bei den folgenden Feldern gibt es Unstimmigkeiten:'
       header:
diff --git a/config/locales/translation.en-CA.yml b/config/locales/translation.en-CA.yml
index d10f8ad442..28b000e488 100644
--- a/config/locales/translation.en-CA.yml
+++ b/config/locales/translation.en-CA.yml
@@ -121,6 +121,9 @@ en-CA:
       header:
         one: 1 error prohibited this %{model} from being saved
         other: "%{count} errors prohibited this %{model} from being saved"
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
   activerecord:
     errors:
       messages:
diff --git a/config/locales/translation.en-GB.yml b/config/locales/translation.en-GB.yml
index adfd57062c..b304bb3441 100644
--- a/config/locales/translation.en-GB.yml
+++ b/config/locales/translation.en-GB.yml
@@ -116,6 +116,9 @@ en-GB:
         other: "%{count} errors prohibited this %{resource} from being saved:"
       model_invalid: 'Validation failed: %{errors}'
       required: must exist
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
     template:
       body: 'There were problems with the following fields:'
       header:
diff --git a/config/locales/translation.en-US.yml b/config/locales/translation.en-US.yml
index 2a054b2d80..3751efc8b3 100644
--- a/config/locales/translation.en-US.yml
+++ b/config/locales/translation.en-US.yml
@@ -116,6 +116,9 @@ en-US:
         other: "%{count} errors prohibited this %{resource} from being saved:"
       model_invalid: 'Validation failed: %{errors}'
       required: must exist
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
     template:
       body: 'There were problems with the following fields:'
       header:
@@ -241,7 +244,7 @@ en-US:
         accept: Accept invitation
         accept_until: 'This invitation will be due in %{due_date}.
 
-'
+          '
         ignore:
     omniauth_callbacks:
       failure: Could not authenticate you from %{kind} because "%{reason}".
diff --git a/config/locales/translation.es.yml b/config/locales/translation.es.yml
index a3521d3a2b..1adb863ec2 100644
--- a/config/locales/translation.es.yml
+++ b/config/locales/translation.es.yml
@@ -116,6 +116,16 @@ es:
         other: "%{count} errores impidieron que este %{resource} fuese guardado:"
       model_invalid: 'La validación falló: %{errors}'
       required: debe existir
+    unavailable_session: |-
+      Sesión %{id} ya no se encuentra disponible en la memoria.
+
+      Si le sucede a ejecutar en un servidor multi-proceso (como el unicornio o Puma) el proceso de
+      esta solicitud golpe no almacena %{id} en la memoria. Considere girando el número de
+      procesos / trabajadores a uno (1) o el uso de un servidor diferente en el desarrollo.
+    unacceptable_request: Una versión compatible Se espera que en la cabecera Aceptar.
+    connection_refused: |-
+      Ups! No se pudo conectar a la consola Web de middleware.
+      Por favor asegúrese de que un servidor de desarrollo carriles se está ejecutando.
     template:
       body: 'Se encontraron problemas con los siguientes campos:'
       header:
diff --git a/config/locales/translation.fi.yml b/config/locales/translation.fi.yml
index 68ab4dcac7..cc675b245a 100644
--- a/config/locales/translation.fi.yml
+++ b/config/locales/translation.fi.yml
@@ -115,6 +115,13 @@ fi:
         other: "%{count} virhettä estivät kohteen %{resource} tallennuksen:"
       model_invalid: 'Validointi epäonnistui: %{errors}'
       required: täytyy olla
+    unavailable_session: Istunnon %{id} ei ole enää saatavilla muistissa. Jos satut
+      ajaa usean prosessin palvelimen (kuten Unicorn tai Puma) prosessi. Tämä pyyntö
+      osuma ei tallenna %{id} muistiin. Tarkastellaan kääntämällä määrä prosessit
+      / työntekijät yhteen (1) tai käyttämällä eri palvelinta kehittämiseen.
+    unacceptable_request: Pitää olla tuettu versio Hyväksytty otsikossa.
+    connection_refused: Oho! Yhteys nettikonsolin väliohjelmistoon epäonnistui. Varmista,
+      että palvelin on käynnissä.
     template:
       body: 'Seuraavat kentät aiheuttivat ongelmia:'
       header:
diff --git a/config/locales/translation.fr-CA.yml b/config/locales/translation.fr-CA.yml
index f36b76baec..7ab41f5169 100644
--- a/config/locales/translation.fr-CA.yml
+++ b/config/locales/translation.fr-CA.yml
@@ -121,6 +121,17 @@ fr-CA:
       header:
         one: " 1 erreur a empêché l’enregistrement de %{model}"
         other: "%{count} erreurs ont empêché l’enregistrement de %{model} "
+    unavailable_session: |
+      La session %{id} n’est plus disponible en mémoire.
+
+      S'il vous arrive d’exécuter le processus sur un serveur multi-processus (comme Unicorn ou Puma), le processus cette requête ne stocke pas %{id} en mémoire. Pensez à remettre le nombre de processus ou de travailleurs à un (1) ou à utiliser un autre serveur en développement.
+    unacceptable_request: 'Une version prise en charge est attendue dans l’en-tête
+      Accept.
+
+      '
+    connection_refused: |
+      Oups! Échec de la connexion à l’intergiciel de la console Web.
+      Veuillez vous assurer qu’un serveur de développement Rails est en cours d'exécution.
   activerecord:
     errors:
       messages:
diff --git a/config/locales/translation.fr-FR.yml b/config/locales/translation.fr-FR.yml
index 490e876eef..e817de7cda 100644
--- a/config/locales/translation.fr-FR.yml
+++ b/config/locales/translation.fr-FR.yml
@@ -116,6 +116,17 @@ fr-FR:
         other: "%{count} erreurs ont empêché d’enregistrer ce(tte) %{resource} :"
       model_invalid: 'Validation échouée : %{errors}'
       required: doit exister
+    unavailable_session: |-
+      La session %{id} n'est plus disponible en mémoire.
+
+      Si vous utilisez un serveur multi-processus (comme Unicorn ou Puma), le processus
+      cet appel de requête ne stocke pas %{id} en mémoire. Pensez à tourner le nombre de
+      processus / travailleurs à un (1) ou en utilisant un serveur différent en développement.
+    unacceptable_request: Une version prise en charge est attendue dans l'en-tête
+      Accept.
+    connection_refused: |-
+      Oops! Impossible de se connecter au middleware Console Web.
+      Assurez-vous que le serveur de développement de rails est en cours d'exécution.
     template:
       body: 'Veuillez vérifier les champs suivants : '
       header:
diff --git a/config/locales/translation.pt-BR.yml b/config/locales/translation.pt-BR.yml
index f7d15265ec..18ec57cc42 100644
--- a/config/locales/translation.pt-BR.yml
+++ b/config/locales/translation.pt-BR.yml
@@ -116,6 +116,18 @@ pt-BR:
         other: "%{count} erros proibiram que esse %{resource} fosse salvo:"
       model_invalid: 'A validação falhou: %{errors}'
       required: é obrigatório(a)
+    unavailable_session: |
+      A sessão %{id} não está mais disponível na memória.
+
+      Se acontecer de você executar em um servidor com vários processos (como Unicorn ou Puma), o processo
+      esta solicitação não armazena %{id} na memória. Considere transformar o número de
+      processos / trabalhadores para um (1) ou usando um servidor diferente em desenvolvimento.
+    unacceptable_request: 'Uma versão suportada é esperada no cabeçalho Accept.
+
+      '
+    connection_refused: |
+      Opa! Falha ao conectar-se ao middleware do console da Web.
+      Por favor, certifique-se de que um servidor de desenvolvimento de trilhos está sendo executado.
     template:
       body: 'Por favor, verifique o(s) seguinte(s) campo(s):'
       header:
diff --git a/config/locales/translation.sv-FI.yml b/config/locales/translation.sv-FI.yml
index c1586645ad..f4d69fecbe 100644
--- a/config/locales/translation.sv-FI.yml
+++ b/config/locales/translation.sv-FI.yml
@@ -116,6 +116,16 @@ sv-FI:
         other: "%{count} fel hindrade detta %{resource} från att sparas:"
       model_invalid: 'Validering misslyckades: %{errors}'
       required: måste finnas
+    unavailable_session: |-
+      Session %{id} är inte längre tillgänglig i minnet.
+
+      Om du råkar köra på en multi-process-server (som Unicorn eller Puma) processen
+      den här förfrågan träffar inte %{id} i minnet. Överväg att vrida antalet
+      processer / arbetare till en (1) eller använder en annan server i utveckling.
+    unacceptable_request: En stödd version förväntas i Accept header.
+    connection_refused: |-
+      hoppsan! Misslyckades att ansluta till middleware-konsolen.
+      Se till att en railsutvecklingsserver körs.
     template:
       body: 'Det var problem med följande fält:'
       header:
diff --git a/config/locales/translation.tr-TR.yml b/config/locales/translation.tr-TR.yml
index 429d441567..bc0a2f5c78 100644
--- a/config/locales/translation.tr-TR.yml
+++ b/config/locales/translation.tr-TR.yml
@@ -128,6 +128,14 @@ tr-TR:
       header:
         one: 1 hata oluştuğu için %{model} kaydedilemedi
         other: "%{count} hata oluştuğu için %{model} kaydedilemedi"
+    unavailable_session: |
+      Oturum %{id} artık bellekte mevcut değil.
+
+      Unicorn veya Puma gibi bir çoklu-işlem sunucusunda çalışıyorsanız, bu isteğe karşılık gelen işlem, %{id}'i bellekte saklamaz. İşlem/çalışan sayısını bir (1) olarak ayarlamayı ya da geliştirme ortamında farklı bir sunucu kullanmayı değerlendirin.
+    unacceptable_request: Accept header'da desteklenen bir sürüm bekleniyor.
+    connection_refused: |-
+      Hata! Web Konsolu ara katman yazılımına bağlanılamadı.
+      Lütfen bir Rails geliştirme sunucusunun çalıştığından emin olun.
   activerecord:
     errors:
       messages: