diff --git a/Gemfile.lock b/Gemfile.lock
index 927c2221e..84f392832 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,22 +38,30 @@ GEM
       tzinfo (~> 1.1)
     ajax-datatables-rails (0.3.1)
       railties (>= 3.1)
+    algorithms (0.6.1)
     ansi (1.5.0)
     arel (6.0.3)
     aspector (0.14.0)
     ast (2.3.0)
-    autoprefixer-rails (6.4.0)
+    auto_strip_attributes (2.1.0)
+      activerecord (>= 3.0)
+    autoprefixer-rails (6.1.2)
       execjs
+      json
     awesome_print (1.7.0)
-    aws-sdk (2.2.37)
-      aws-sdk-resources (= 2.2.37)
-    aws-sdk-core (2.2.37)
+    aws-sdk (2.2.8)
+      aws-sdk-resources (= 2.2.8)
+    aws-sdk-core (2.2.8)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.37)
-      aws-sdk-core (= 2.2.37)
+    aws-sdk-resources (2.2.8)
+      aws-sdk-core (= 2.2.8)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -61,34 +69,34 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.7)
+    bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     bootstrap-select-rails (1.6.3)
     bootstrap3-datetimepicker-rails (4.15.35)
       momentjs-rails (>= 2.8.1)
-    bootstrap_form (2.4.0)
+    bootstrap_form (2.3.0)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (8.2.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
-    coffee-rails (4.2.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
     commit_param_routing (0.0.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.0)
     debug_inspector (0.0.2)
-    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.1)
-    delayed_job_active_record (4.1.1)
-      activerecord (>= 3.0, < 5.1)
+    delayed_job (4.1.1)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.1.0)
+      activerecord (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)
     devise (3.5.6)
       bcrypt (~> 3.0)
@@ -97,14 +105,14 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-async (0.10.2)
-      devise (>= 3.2, < 4.0)
-    devise_invitable (1.6.0)
-      actionmailer (>= 3.2.6)
+    devise-async (0.10.1)
+      devise (~> 3.2)
+    devise_invitable (1.5.5)
+      actionmailer (>= 3.2.6, < 5)
       devise (>= 3.2.0)
     erubis (2.7.0)
-    execjs (2.7.0)
-    faker (1.6.6)
+    execjs (2.6.0)
+    faker (1.6.1)
       i18n (~> 0.5)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -114,14 +122,14 @@ GEM
       activesupport (>= 4.1.0)
     hammerjs-rails (2.0.4)
     i18n (0.7.0)
-    i18n-js (3.0.0.rc13)
-      i18n (~> 0.6, >= 0.6.6)
+    i18n-js (3.0.0.rc11)
+      i18n (~> 0.6)
     introjs-rails (1.0.0)
       sass-rails (>= 3.2)
       thor (~> 0.14)
-    jmespath (1.3.1)
-    jquery-rails (4.1.1)
-      rails-dom-testing (>= 1, < 3)
+    jmespath (1.1.3)
+    jquery-rails (4.0.5)
+      rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-scrollto-rails (1.4.3)
@@ -131,21 +139,20 @@ GEM
       turbolinks
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    js_cookie_rails (2.1.2)
+    js_cookie_rails (1.0.1)
       railties (>= 3.1)
     json (1.8.3)
-    kaminari (0.17.0)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    lazy_priority_queue (0.1.1)
     little-plugger (1.1.4)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     mime-types (1.25.1)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
@@ -157,16 +164,17 @@ GEM
       ruby-progressbar
     momentjs-rails (2.10.6)
       railties (>= 3.1)
-    multi_json (1.12.1)
-    nested_form_fields (0.7.8)
+    multi_json (1.11.2)
+    nested_form_fields (0.7.4)
       coffee-rails (>= 3.2.1)
       jquery-rails
       rails (>= 3.2.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
+    oj (2.17.4)
     orm_adapter (0.5.0)
-    paperclip (4.3.7)
+    paperclip (4.3.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -203,8 +211,8 @@ GEM
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
+    rails_serve_static_assets (0.0.4)
+    rails_stdout_logging (0.0.4)
     railties (4.2.5)
       actionpack (= 4.2.5)
       activesupport (= 4.2.5)
@@ -212,15 +220,15 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     rake (11.2.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    redcarpet (3.3.4)
+    rdoc (4.2.0)
+    redcarpet (3.3.3)
     remotipart (1.2.1)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    rgl (0.5.2)
-      lazy_priority_queue (~> 0.1.0)
+    rgl (0.5.1)
+      algorithms (~> 0.6.1)
       stream (~> 0.5.0)
+    rkelly-remix (0.0.7)
     roo (2.1.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
@@ -248,31 +256,39 @@ GEM
       activesupport (>= 4.0.0)
     skylight (0.10.0)
       activesupport (>= 3.0.0)
+    sourcemap (0.1.1)
     spinjs-rails (1.4)
       rails (>= 3.1)
-    sprockets (3.7.0)
+    sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    starscope (1.5.3)
+      babel-transpiler (~> 0.7)
+      oj (~> 2.9)
+      parser (>= 2.2.2)
+      rkelly-remix (~> 0.0.7)
+      ruby-progressbar (~> 1.5)
+      sourcemap (~> 0.1)
     stream (0.5)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.5)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
+    tilt (2.0.1)
+    turbolinks (2.5.3)
+      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
-      execjs (>= 0.3.0, < 3)
+    uglifier (2.7.2)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
     underscore-rails (1.8.3)
     unicode-display_width (1.1.0)
     warden (1.2.6)
       rack (>= 1.0)
-    wicked_pdf (1.0.6)
+    wicked_pdf (1.0.3)
     wkhtmltopdf-heroku (2.12.3.0)
     yomu (0.2.4)
       json (~> 1.8)
@@ -284,6 +300,7 @@ PLATFORMS
 DEPENDENCIES
   ajax-datatables-rails (~> 0.3.1)
   aspector
+  auto_strip_attributes (~> 2.1)
   awesome_print
   aws-sdk (~> 2.2.8)
   aws-sdk-v1
@@ -334,6 +351,7 @@ DEPENDENCIES
   shoulda-matchers (>= 3.0.1)
   skylight
   spinjs-rails
+  starscope
   turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)