diff --git a/Gemfile b/Gemfile
index 5629cd8..bc877d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'dalli'
 gem 'writeexcel'
 gem 'nested_form'
 gem 'unf'
-gem 'json', '1.8.3'
+gem 'json', '2.3.1'
 gem 'jquery-rails'
 gem 'will_paginate', '~> 3.1.0'
 gem 'jwt', '~> 1.5', '>= 1.5.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b44ac6..1db4b9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,6 +58,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    concurrent-ruby (1.1.6)
     daemons (1.1.9)
     dalli (2.6.4)
     database_cleaner (1.2.0)
@@ -94,12 +95,13 @@ GEM
     formatador (0.2.4)
     gmaps4rails (2.1.0)
     hike (1.2.3)
-    i18n (0.6.5)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (2.3.1)
     jwt (1.5.6)
     libv8 (3.11.8.17)
     mail (2.4.4)
@@ -111,7 +113,7 @@ GEM
     mini_magick (3.6.0)
       subexec (~> 0.2.1)
     mini_portile (0.5.2)
-    multi_json (1.8.2)
+    multi_json (1.15.0)
     mysql2 (0.3.18)
     mysql2 (0.3.18-x86-mingw32)
     nested_form (0.3.2)
@@ -127,12 +129,12 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (1.4.5)
-    rack-cache (1.2)
+    rack (1.4.7)
+    rack-cache (1.12.0)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.11)
       actionmailer (= 3.2.11)
@@ -149,10 +151,9 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
+    rake (13.0.1)
     rb-readline (0.5.5)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rdoc (3.9.5)
     rolify (3.2.0)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
@@ -173,7 +174,7 @@ GEM
       tilt (~> 1.3)
     shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -189,7 +190,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
+    thor (0.20.3)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
@@ -237,7 +238,7 @@ DEPENDENCIES
   fog
   gmaps4rails
   jquery-rails
-  json (= 1.8.3)
+  json (= 2.3.1)
   jwt (~> 1.5, >= 1.5.4)
   libv8 (~> 3.11.8)
   mini_magick