diff --git a/Gemfile b/Gemfile
index da2fa531..972bd4bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,15 +4,15 @@ ruby '2.2.3'
 gem 'dotenv-rails', groups: [:development, :test]
 gem 'rails', '~> 4.2.4'
 gem 'airbrake', '~> 5.2'
-gem 'devise'
-gem 'geokit'
-gem 'haml'
-gem 'http_accept_language'
-gem 'local_time'
+gem 'devise', '~> 3.0'
+gem 'geokit', '~> 1.0'
+gem 'haml', '~> 4.0'
+gem 'http_accept_language', '~> 2.0'
+gem 'local_time', '~> 1.0'
 gem 'obscenity', '~> 1.0', '>= 1.0.2'
 gem 'pg'
-gem 'rails_admin'
-gem 'validates_formatting_of'
+gem 'rails_admin', '~> 1.0'
+gem 'validates_formatting_of', '~> 0.9.0'
 
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 gem 'paranoia', '~> 2.2'
@@ -34,7 +34,6 @@ group :production do
 end
 
 group :test do
-  gem 'byebug'
   gem 'coveralls', require: false
   gem 'simplecov', require: false
   gem 'rubocop'
diff --git a/Gemfile.lock b/Gemfile.lock
index 19e82e14..92e84fef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,67 +1,67 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    airbrake (5.2.3)
-      airbrake-ruby (~> 1.2)
-    airbrake-ruby (1.2.2)
-    arel (6.0.3)
-    ast (2.2.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    airbrake (5.8.1)
+      airbrake-ruby (~> 1.8)
+    airbrake-ruby (1.8.0)
+    arel (6.0.4)
+    ast (2.3.0)
     bcrypt (3.1.11)
-    builder (3.2.2)
-    byebug (8.2.4)
-    coffee-rails (4.1.1)
+    builder (3.2.3)
+    byebug (9.1.0)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    devise (3.5.6)
+    devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -69,157 +69,177 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     docile (1.1.5)
-    dotenv (2.1.1)
-    dotenv-rails (2.1.1)
-      dotenv (= 2.1.1)
-      railties (>= 4.0, < 5.1)
+    dotenv (2.2.1)
+    dotenv-rails (2.2.1)
+      dotenv (= 2.2.1)
+      railties (>= 3.2, < 5.2)
     erubis (2.7.0)
-    execjs (2.6.0)
-    font-awesome-rails (4.5.0.1)
-      railties (>= 3.2, < 5.1)
-    geokit (1.10.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    font-awesome-rails (4.7.0.2)
+      railties (>= 3.2, < 5.2)
+    geokit (1.11.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     haml (4.0.7)
       tilt
-    hashdiff (0.3.0)
-    http_accept_language (2.0.5)
-    i18n (0.7.0)
-    jquery-rails (4.1.1)
+    hashdiff (0.3.6)
+    http_accept_language (2.1.1)
+    i18n (0.8.6)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (1.8.3)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    json (2.1.0)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     local_time (1.0.3)
       coffee-rails
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.1.0)
-    minitest (5.8.4)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     nested_form (0.3.2)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     obscenity (1.0.2)
     orm_adapter (0.5.0)
-    paranoia (2.2.0)
-      activerecord (>= 4.0, < 5.1)
-    parser (2.3.0.7)
+    parallel (1.12.0)
+    paranoia (2.3.1)
+      activerecord (>= 4.0, < 5.2)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.18.4)
-    pkg-config (1.1.7)
+    pg (0.21.0)
     powerpack (0.1.1)
-    puma (3.4.0)
-    rack (1.6.4)
-    rack-pjax (0.8.0)
+    public_suffix (3.0.0)
+    puma (3.10.0)
+    rack (1.6.8)
+    rack-pjax (1.0.0)
       nokogiri (~> 1.5)
-      rack (~> 1.1)
+      rack (>= 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.9)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_admin (0.8.1)
+    rails_admin (1.2.0)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
-      haml (~> 4.0)
+      haml (>= 4.0, < 6)
       jquery-rails (>= 3.0, < 5)
       jquery-ui-rails (~> 5.0)
-      kaminari (~> 0.14)
+      kaminari (>= 0.14, < 2.0)
       nested_form (~> 0.3)
-      rack-pjax (~> 0.7)
-      rails (~> 4.0)
-      remotipart (~> 1.0)
-      safe_yaml (~> 1.0)
+      rack-pjax (>= 0.7)
+      rails (>= 4.0, < 6)
+      remotipart (~> 1.3)
       sass-rails (>= 4.0, < 6)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (11.1.2)
-    remotipart (1.2.1)
-    responders (2.1.2)
-      railties (>= 4.2.0, < 5.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    remotipart (1.3.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
-    sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.5.1)
+      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.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    simplecov (0.11.2)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    skylight (0.10.3)
+    simplecov-html (0.10.2)
+    skylight (1.3.1)
       activesupport (>= 3.0.0)
-    spring (1.7.2)
-    sprockets (3.6.0)
+    spring (2.0.2)
+      activesupport (>= 4.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.2)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tins (1.15.0)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.0.3)
+    unicode-display_width (1.3.0)
     validates_formatting_of (0.9.0)
       activemodel
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
-    webmock (1.24.2)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -231,19 +251,19 @@ DEPENDENCIES
   airbrake (~> 5.2)
   byebug
   coveralls
-  devise
+  devise (~> 3.0)
   dotenv-rails
-  geokit
-  haml
-  http_accept_language
-  local_time
+  geokit (~> 1.0)
+  haml (~> 4.0)
+  http_accept_language (~> 2.0)
+  local_time (~> 1.0)
   obscenity (~> 1.0, >= 1.0.2)
   paranoia (~> 2.2)
   pg
   puma
   rails (~> 4.2.4)
   rails_12factor
-  rails_admin
+  rails_admin (~> 1.0)
   rubocop
   sass-rails (>= 4.0.3)
   simplecov
@@ -251,11 +271,11 @@ DEPENDENCIES
   spring
   tzinfo-data
   uglifier
-  validates_formatting_of
+  validates_formatting_of (~> 0.9.0)
   webmock
 
 RUBY VERSION
    ruby 2.2.3p173
 
 BUNDLED WITH
-   1.13.7
+   1.14.4