Merge 0359fbb into 80f32b9

Gemfile.lock

@@ -82,6 +82,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
     config (1.4.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.1.1)
@@ -93,8 +95,8 @@ GEM
       tins (~> 1.6)
     debug_inspector (0.0.3)
     deep_merge (1.1.1)
-    default_value_for (3.0.2)
-      activerecord (>= 3.2.0, < 5.1)
+    default_value_for (3.0.3)
+      activerecord (>= 3.2.0, < 5.2)
     devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -138,7 +140,8 @@ GEM
     hashie (3.5.6)
     highline (1.7.8)
     hike (1.2.3)
-    i18n (0.8.6)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
@@ -159,7 +162,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     mysql2 (0.4.9)
     net-scp (1.2.1)