diff --git a/Gemfile b/Gemfile
index e35652d93..c92d06b6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 ruby '2.3.0'
 
-gem 'rails', '~> 4.2.7.1'
+gem 'rails', '~> 4.2'
 gem 'rails-i18n'
 gem "rdiscount"
 gem 'high_voltage', '~> 2.1.0'
-gem 'activeadmin', github: 'activeadmin'
+gem 'activeadmin'
 gem 'has_scope'
 gem 'pundit'
 gem 'pg', '0.17.1'
@@ -20,7 +20,7 @@ gem 'kaminari'
 gem "simple_form", ">= 3.0.0"
 gem 'memcachier'
 gem 'rollbar', '2.8.3'
-gem 'whenever', :require => false
+gem 'whenever', require: false
 gem 'prawn'
 gem 'prawn-table'
 gem 'bundler', '>= 1.10.6'
@@ -28,7 +28,7 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 # Assets
-gem 'jquery-rails', '4.0.4'
+gem 'jquery-rails', '>= 4.2.0'
 gem 'jquery-ui-rails'
 gem 'bootstrap-sass'
 gem 'sass-rails', '~> 5.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5812b2581..1aa01c7e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,3 @@
-GIT
-  remote: git://github.com/activeadmin/activeadmin.git
-  revision: 60914c887942cb34d737428fb9813f69bb8ae3ee
-  specs:
-    activeadmin (1.0.0.pre)
-      arbre (~> 1.0, >= 1.0.2)
-      bourbon
-      coffee-rails
-      formtastic (~> 3.1)
-      formtastic_i18n
-      inherited_resources (~> 1.6)
-      jquery-rails
-      jquery-ui-rails (~> 5.0)
-      kaminari (~> 0.15)
-      rails (>= 3.2, < 5.0)
-      ransack (~> 1.3)
-      sass-rails
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -38,6 +20,18 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activeadmin (1.2.1)
+      arbre (>= 1.1.1)
+      coffee-rails
+      formtastic (~> 3.1)
+      formtastic_i18n
+      inherited_resources (~> 1.7)
+      jquery-rails (>= 4.2.0)
+      kaminari (>= 0.15, < 2.0)
+      railties (>= 4.2, < 5.2)
+      ransack (~> 1.3)
+      sass (~> 3.1)
+      sprockets (< 4.1)
     activejob (4.2.7.1)
       activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
@@ -58,7 +52,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     airbrussh (0.8.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    arbre (1.0.3)
+    arbre (1.1.1)
       activesupport (>= 3.0.0)
     arel (6.0.4)
     ast (2.0.0)
@@ -77,9 +71,6 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bourbon (3.2.4)
-      sass (~> 3.2)
-      thor
     builder (3.2.3)
     byebug (4.0.5)
       columnize (= 0.9.0)
@@ -152,9 +143,9 @@ GEM
     foreman (0.77.0)
       dotenv (~> 1.0.2)
       thor (~> 0.19.1)
-    formtastic (3.1.3)
+    formtastic (3.1.5)
       actionpack (>= 3.2.13)
-    formtastic_i18n (0.1.1)
+    formtastic_i18n (0.6.0)
     gli (2.16.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
@@ -170,13 +161,13 @@ GEM
     http_accept_language (2.0.2)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
-    inherited_resources (1.6.0)
-      actionpack (>= 3.2, < 5)
-      has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 5)
+    inherited_resources (1.8.0)
+      actionpack (>= 4.2, <= 5.2)
+      has_scope (~> 0.6)
+      railties (>= 4.2, <= 5.2)
       responders
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.3)
@@ -220,7 +211,7 @@ GEM
       ast (>= 1.1, < 3.0)
     pdf-core (0.5.1)
     pg (0.17.1)
-    polyamorous (1.1.0)
+    polyamorous (1.3.3)
       activerecord (>= 3.0)
     powerpack (0.0.9)
     prawn (2.0.1)
@@ -270,12 +261,12 @@ GEM
     rainbow (2.0.0)
     raindrops (0.16.0)
     rake (12.3.0)
-    ransack (1.6.3)
+    ransack (1.8.6)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
-      polyamorous (~> 1.1)
+      polyamorous (~> 1.3.2)
     rdiscount (2.1.7.1)
     responders (2.0.2)
       railties (>= 4.2.0.alpha, < 5)
@@ -373,7 +364,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin!
+  activeadmin
   airbrussh
   better_errors
   binding_of_caller
@@ -397,7 +388,7 @@ DEPENDENCIES
   high_voltage (~> 2.1.0)
   hstore_translate
   http_accept_language
-  jquery-rails (= 4.0.4)
+  jquery-rails (>= 4.2.0)
   jquery-ui-rails
   kaminari
   letter_opener (= 1.4.1)
@@ -409,7 +400,7 @@ DEPENDENCIES
   prawn-table
   pundit
   quiet_assets
-  rails (~> 4.2.7.1)
+  rails (~> 4.2)
   rails-i18n
   rails_12factor (= 0.0.3)
   rake