Merge branch 'master' into flag-submission-box-disappears-mitre-cyber…

…-academy#530

Gemfile.lock

@@ -75,7 +75,7 @@ GEM
       rails (>= 3.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    brakeman (4.8.2)
+    brakeman (4.9.0)
     builder (3.2.4)
     bundler-audit (0.7.0.1)
       bundler (>= 1.2.0, < 3)
@@ -87,7 +87,7 @@ GEM
       mime-types (>= 1.16)
     carrierwave-postgresql (0.2.0)
       carrierwave (~> 0.10.0)
-    chartkick (3.3.2)
+    chartkick (3.4.0)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -131,7 +131,7 @@ GEM
     geocoder (1.6.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    groupdate (5.0.0)
+    groupdate (5.1.0)
       activesupport (>= 5)
     haml (5.1.2)
       temple (>= 0.8.0)
@@ -214,11 +214,11 @@ GEM
     passenger (6.0.6)
       rack
       rake (>= 0.8.1)
-    pdf-core (0.7.0)
+    pdf-core (0.8.1)
     pg (1.2.3)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
+    prawn (2.3.0)
+      pdf-core (~> 0.8.1)
+      ttfunk (~> 1.6)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)