Merge branch 'EDUCATOR-162' into aed/nokogiri-activemodel-upgrades

Gemfile

@@ -16,6 +16,8 @@ gem 'sinatra-param', '~> 1.4'
 
 gem 'yajl-ruby'
 
+gem 'activemodel', '~> 4.2.8'
+
 gem 'mongoid', '~> 5.0.0'
 gem 'bson', '~> 3.1'
 gem 'bson_ext'

Gemfile.lock

@@ -215,6 +215,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activemodel (~> 4.2.8)
   bson (~> 3.1)
   bson_ext
   bundler
@@ -256,5 +257,8 @@ DEPENDENCIES
   will_paginate_mongoid (~> 2.0)
   yajl-ruby
 
+RUBY VERSION
+   ruby 2.4.1p111
+
 BUNDLED WITH
    1.16.0