Merge branch 'master' into 'dependabot/bundler/jquery-rails-4.4.0'

# Conflicts:
#   Gemfile.lock

Gemfile.lock

@@ -65,7 +65,7 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.9.23)
+    ffi (1.15.4)
     font-awesome5-rails (1.0.1)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
@@ -101,8 +101,7 @@ GEM
     pg (0.21.0)
     popper_js (1.12.9)
     puma (3.10.0)
-    racc (1.5.2)
-    rack (2.2.3)
+    rack (2.0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7)