diff --git a/Gemfile.lock b/Gemfile.lock
index 6be17982..358e1578 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,7 +11,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
+    RedCloth (4.3.2)
     aasm (3.4.0)
     actionmailer (4.2.10)
       actionpack (= 4.2.10)
@@ -26,8 +26,8 @@ GEM
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionpack-xml_parser (1.0.1)
-      actionpack (>= 4.0.0.rc1)
+    actionpack-xml_parser (1.0.2)
+      actionpack (>= 4.0.0, < 5)
     actionview (4.2.10)
       activesupport (= 4.2.10)
       builder (~> 3.1)
@@ -49,81 +49,94 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_list (0.7.2)
+    acts_as_list (0.9.15)
       activerecord (>= 3.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    aruba (0.14.5)
+      childprocess (>= 0.6.3, < 0.10.0)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
     ast (2.4.0)
-    autoprefixer-rails (5.1.0)
+    autoprefixer-rails (8.6.3)
       execjs
-      json
-    bcrypt (3.1.9)
+    backports (3.11.3)
+    bcrypt (3.1.12)
     bootstrap-sass (3.3.3)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.2.19)
     builder (3.2.3)
-    bullet (4.14.0)
+    bullet (5.7.5)
       activesupport (>= 3.0.0)
-      uniform_notifier (>= 1.6.0)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
+      uniform_notifier (~> 1.11.0)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.6.2)
+      xpath (>= 2.0, < 4.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.7)
-      climate_control (>= 0.0.3, < 1.0)
-    codeclimate-test-reporter (0.4.1)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    coffee-rails (4.1.0)
+    climate_control (0.2.0)
+    codeclimate-test-reporter (1.0.7)
+      simplecov
+    coderay (1.1.2)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    crass (0.2.1)
-    cucumber (1.3.18)
+    contracts (0.16.0)
+    crass (1.0.4)
+    cucumber (3.1.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      cucumber-core (~> 3.1.0)
+      cucumber-expressions (~> 6.0.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (~> 1.3)
+      gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.2)
+      multi_test (>= 0.1.2)
+    cucumber-core (3.1.0)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (~> 1.1.0)
+      gherkin (>= 5.0.0)
+    cucumber-expressions (6.0.1)
+    cucumber-rails (1.5.0)
       capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 2)
-      mime-types (>= 1.16, < 3)
+      cucumber (>= 1.3.8, < 4)
+      mime-types (>= 1.17, < 4)
       nokogiri (~> 1.5)
-      rails (>= 3, < 5)
-    daemons (1.1.9)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
+      railties (>= 4, < 5.2)
+    cucumber-tag_expressions (1.1.1)
+    cucumber-wire (0.0.1)
+    daemons (1.2.6)
+    database_cleaner (1.7.0)
+    diff-lcs (1.3)
+    docile (1.3.1)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
-    execjs (2.6.0)
-    factory_girl (4.5.0)
+    eventmachine (1.2.7)
+    execjs (2.7.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.9.0)
+      factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
-    ffi (1.9.18)
+    ffi (1.9.25)
     font-awesome-sass (4.5.0)
       sass (>= 3.2)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
+    gherkin (5.1.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    htmlentities (4.3.3)
+    htmlentities (4.3.4)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
@@ -133,47 +146,50 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (2.1.0)
-    libv8 (3.16.14.7)
-    loofah (2.0.3)
+    libv8 (3.16.14.19)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (2.99.3)
-    mimemagic (0.3.0)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.1.0)
     minitest (5.11.3)
-    minitest-stub-const (0.5)
-    mocha (1.1.0)
+    minitest-stub-const (0.6)
+    mocha (1.5.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    multi_test (0.1.1)
-    mysql2 (0.3.20)
+    multi_json (1.13.1)
+    multi_test (0.1.2)
+    mysql2 (0.3.21)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogumbo (1.1.12)
+    nokogumbo (1.5.0)
       nokogiri
-    paperclip (4.3.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.0.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.10.1)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
     rack (1.6.10)
-    rack-dev-mark (0.7.3)
-      rack (>= 1.1)
-    rack-mini-profiler (0.9.2)
-      rack (>= 1.1.3)
+    rack-dev-mark (0.7.7)
+      rack (>= 1.1, < 2.1)
+    rack-mini-profiler (1.0.0)
+      rack (>= 1.2.0)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.10)
@@ -189,8 +205,8 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails_autolink (1.1.6)
       rails (> 3.1)
     railties (4.2.10)
@@ -200,11 +216,14 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
-    ref (1.0.5)
-    rspec-expectations (3.1.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ref (2.0.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rubocop (0.57.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -216,13 +235,17 @@ GEM
     ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
-    sanitize (3.0.3)
-      crass (~> 0.2.0)
+    sanitize (4.6.5)
+      crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (= 1.1.12)
-    sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+      nokogumbo (~> 1.4)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
@@ -231,51 +254,52 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    spring (1.1.3)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    spring (2.0.2)
+      activesupport (>= 4.2)
     spring-commands-cucumber (1.0.1)
       spring (>= 0.9.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.13)
     swf_fu (2.0.4)
       coffee-script
       rails (>= 3.1)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thin (1.6.3)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tilt (2.0.4)
+    tilt (2.0.8)
     tolk (1.9.3)
       rails (>= 4.0, < 4.3)
       safe_yaml (>= 0.8.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (4.1.11)
+      execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
-    uniform_notifier (1.6.2)
-    websocket (1.2.4)
-    will_paginate (3.0.7)
-    xpath (2.0.0)
+    uniform_notifier (1.11.0)
+    websocket (1.2.8)
+    will_paginate (3.1.6)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
+    yard (0.9.14)
 
 PLATFORMS
   ruby