diff --git a/Gemfile b/Gemfile
index f6ecb69..bee864b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ group :assets do
 end
 
 gem 'jquery-rails', '~> 3.0.4'
-gem 'json', '~> 1.8.0'
+gem 'json', '~> 2.3.1'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index fbe07a9..b4a0c54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,6 +54,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     columnize (0.9.0)
+    concurrent-ruby (1.1.6)
     debugger (1.6.3)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
@@ -64,17 +65,18 @@ GEM
     execjs (2.6.0)
     hashery (2.1.1)
     hike (1.2.3)
-    i18n (0.7.0)
+    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)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.12.1)
+    multi_json (1.15.0)
     mysql2 (0.3.20)
     net-ldap (0.3.1)
     pdf-reader (1.3.3)
@@ -90,7 +92,7 @@ GEM
     prototype-rails (3.2.1)
       rails (~> 3.2)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
@@ -113,9 +115,8 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (11.2.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rake (13.0.1)
+    rdoc (3.9.5)
     rmagick (2.13.4)
     ruby-oci8 (2.1.8)
     ruby-rc4 (0.1.5)
@@ -129,7 +130,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.19.1)
+    thor (1.0.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -152,7 +153,7 @@ DEPENDENCIES
   debugger
   debugger-ruby_core_source (~> 1.2.3)
   jquery-rails (~> 3.0.4)
-  json (~> 1.8.0)
+  json (~> 2.3.1)
   mysql2 (~> 0.3.11)
   net-ldap (~> 0.3.1)
   prawn (~> 0.12.0)