diff --git a/Gemfile b/Gemfile
index 908d7d56d..4a8f97df8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '3.2.22.5'
 ##gem 'rack', '~> 1.5.4'
 ## gem 'hoptoad_notifier', '2.4.11'
 gem 'jammit', '0.6.5'
-gem 'json', '1.8.3'
+gem 'json', '2.3.1'
 gem 'axlsx', :git => 'https://github.com/randym/axlsx.git', :branch => 'release-3.0.0'
 gem 'axlsx_rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e645e14f..e7317b5bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     color (1.8)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     daemons (1.2.6)
     devise (1.4.7)
       bcrypt-ruby (~> 3.0)
@@ -109,7 +109,7 @@ GEM
     jammit (0.6.5)
       yui-compressor (>= 0.9.3)
     journey (1.0.4)
-    json (1.8.3)
+    json (2.3.1)
     kgio (2.11.2)
     launchy (2.0.5)
       addressable (~> 2.2.6)
@@ -127,7 +127,7 @@ GEM
     mini_portile2 (2.3.0)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.0.7)
@@ -159,7 +159,7 @@ GEM
       pdf-reader (>= 0.9.0)
       ttfunk (~> 1.0.2)
     rack (1.4.7)
-    rack-cache (1.7.2)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
@@ -186,8 +186,7 @@ GEM
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rdoc (3.9.5)
     rmagick (2.13.2)
     ruby-rc4 (0.1.5)
     rubyzip (1.2.1)
@@ -222,7 +221,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.0)
+    thor (1.0.1)
     tilt (1.4.1)
     transaction-simple (1.4.0.2)
     treetop (1.4.15)
@@ -263,7 +262,7 @@ DEPENDENCIES
   foreigner (= 1.0.3)
   intermine (~> 1.4)
   jammit (= 0.6.5)
-  json (= 1.8.3)
+  json (= 2.3.1)
   launchy (= 2.0.5)
   letter_opener
   mocha (= 1.3)