diff --git a/Gemfile b/Gemfile
index 9f4b8c100..2983c81dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'coffee-rails'
 gem "therubyracer", :platforms => :ruby
 gem "pry", :group => [:test, :development]
 gem "byebug", :group => [:test, :development]
-gem "rails", "~> 4.1.8"
+gem "rails", "~> 4.2.0"
 gem "pg"
 gem "kgio", :platforms => :ruby
 gem "dalli", :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 9078b45d0..1c5056c8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,53 +14,61 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    awesome_print (1.2.0)
-    aws-sdk (2.1.7)
-      aws-sdk-resources (= 2.1.7)
-    aws-sdk-core (2.1.7)
+    addressable (2.3.8)
+    arel (6.0.3)
+    awesome_print (1.6.1)
+    aws-sdk (2.1.14)
+      aws-sdk-resources (= 2.1.14)
+    aws-sdk-core (2.1.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.7)
-      aws-sdk-core (= 2.1.7)
+    aws-sdk-resources (2.1.14)
+      aws-sdk-core (= 2.1.14)
     bcrypt (3.1.10)
     bcrypt (3.1.10-x64-mingw32)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     bcrypt-ruby (3.1.5-x64-mingw32)
       bcrypt (>= 3.1.3)
+    bigdecimal (1.2.7)
     buftok (0.2.0)
     builder (3.2.2)
-    byebug (3.2.0)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-    capistrano (2.15.5)
+    byebug (6.0.0)
+    capistrano (2.15.6)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -72,69 +80,61 @@ GEM
       capistrano (< 3.0)
     chronic (0.10.2)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    coinbase (2.1.1)
-      hashie (>= 1.2.0)
-      httparty (>= 0.8.3)
-      monetize (~> 0.3.0)
-      money (~> 6.0)
-      multi_json (>= 1.3.4)
-      oauth2 (~> 1.0)
-    columnize (0.9.0)
+    coffee-script-source (1.9.1.1)
+    coinbase (4.0.7)
+      bigdecimal
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    crass (1.0.1)
-    daemons (1.1.9)
-    dalli (2.7.0)
-    debugger-linecache (1.2.0)
-    delayed_job (4.0.1)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
-      activerecord (>= 3.0, < 4.2)
+    crass (1.0.2)
+    daemons (1.2.3)
+    dalli (2.7.4)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
-    docile (1.1.3)
-    domain_name (0.5.18)
+    docile (1.1.5)
+    domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.9)
+    equalizer (0.0.11)
     erubis (2.7.0)
-    execjs (2.0.2)
-    factory_girl (4.4.0)
+    execjs (2.6.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.24.0)
-    ffi (1.9.8-x64-mingw32)
+    ffaker (2.1.0)
+    ffi (1.9.10-x64-mingw32)
     gctools (0.2.3)
-    hashie (3.3.1)
-    highline (1.6.21)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    highline (1.7.3)
     hike (1.2.3)
-    http (0.6.3)
+    http (0.6.4)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
-    httparty (0.13.3)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jmespath (1.0.2)
       multi_json (~> 1.0)
     json (1.8.3)
-    jwt (1.2.0)
-    kgio (2.9.2)
-    libv8 (3.16.14.3)
+    kgio (2.9.3)
+    libv8 (3.16.14.11)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mechanize (2.7.2)
+    mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0.0)
-      mime-types (~> 1.17, >= 1.17.2)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
@@ -145,30 +145,25 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.4.3)
-    mocha (1.0.0)
+    minitest (5.8.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    monetize (0.3.0)
-      money (~> 6.1.0.beta1)
-    money (6.1.1)
-      i18n (~> 0.6.4)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     naught (1.0.0)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    net-scp (1.2.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
+    net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    netrc (0.10.2)
-    newrelic_rpm (3.9.6.257)
+    netrc (0.10.3)
+    newrelic_rpm (3.13.0.299)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-x64-mingw32)
@@ -176,105 +171,114 @@ GEM
     nokogumbo (1.2.0)
       nokogiri
     ntlm-http (0.1.1)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    pg (0.18.1)
-    pg (0.18.1-x64-mingw32)
-    protected_attributes (1.0.7)
+    pg (0.18.2)
+    pg (0.18.2-x64-mingw32)
+    protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    pry (0.10.1-x64-mingw32)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
     radix62 (1.0.1)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
-      sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+      railties (= 4.2.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.13.0)
+    raindrops (0.15.0)
     rake (10.4.2)
-    ref (1.0.5)
-    rest-client (1.7.2)
+    ref (2.0.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rest-client (1.7.2-x64-mingw32)
+    rest-client (1.8.0-x64-mingw32)
       ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rmagick (2.15.0)
-    ruby-prof (0.14.2)
-    rubyzip (1.1.6)
-    safe_yaml (1.0.2)
+    rmagick (2.15.4)
+    ruby-prof (0.15.8)
+    rubyzip (1.1.7)
+    safe_yaml (1.0.4)
     sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
-    shoulda-matchers (2.6.0)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simple_form (3.0.2)
+    simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     simple_oauth (0.3.1)
-    simplecov (0.8.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.5.0)
-    sprockets (2.11.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     statistics2 (0.54)
     streamio-ffmpeg (1.0.0)
-    stripe (1.18.0)
+    stripe (1.25.0)
       json (~> 1.8.1)
-      mime-types (>= 1.25, < 3.0)
       rest-client (~> 1.4)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    timecop (0.7.1)
-    tins (1.1.0)
-    twitter (5.13.0)
+    timecop (0.8.0)
+    tins (1.6.0)
+    twitter (5.14.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.9)
@@ -287,26 +291,27 @@ GEM
       simple_oauth (~> 0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.4)
+    tzinfo-data (1.2015.6)
       tzinfo (>= 1.0.0)
-    uglifier (2.5.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
-    unicorn (4.8.2)
+    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.1-x64-mingw32)
+    unicorn (4.9.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    vcr (2.9.0)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    vcr (2.9.3)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
-    whenever (0.9.2)
-      activesupport (>= 2.3.4)
+    whenever (0.9.4)
       chronic (>= 0.6.3)
+    win32console (1.3.2)
 
 PLATFORMS
   ruby
@@ -342,7 +347,7 @@ DEPENDENCIES
   protected_attributes
   pry
   radix62 (~> 1.0.1)
-  rails (~> 4.1.8)
+  rails (~> 4.2.0)
   rmagick
   ruby-imagespec!
   ruby-prof