diff --git a/Appraisals b/Appraisals
index 7dffa19..25542fa 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,97 +1,231 @@
-appraise "rails-4-0-mysql" do
-  gem "mysql2", "~> 0.3.10"
-  gem "rails", "4.0.13"
-end
+ruby_version = Gem::Version.new(RUBY_VERSION)
+
+# In Ruby 2.4 some incompatibility wth numeric types was created that affected
+# Rails 4.0 and 4.1 making them unable to run
+# More info: https://stackoverflow.com/questions/41504106/ruby-2-4-and-rails-4-stack-level-too-deep-systemstackerror
+ruby_2_4 = Gem::Version.new('2.4.0')
+
+# Rails 6 demands ruby over 2.4.4
+ruby_2_4_4 = Gem::Version.new('2.4.4')
+
+# Globalize latest version (5.3.0) demands ruby over 2.4.6. We need to force
+# another version in prior versions
+ruby_2_4_6 = Gem::Version.new('2.4.6')
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-mysql" do
+    gemspec
+    gem "mysql2", "~> 0.3.10"
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '3.5.0'
+  end
+
+  appraise "rails-4-1-mysql" do
+    gemspec
+    gem "mysql2", "~> 0.3.13"
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
 
-appraise "rails-4-1-mysql" do
-  gem "mysql2", "~> 0.3.13"
-  gem "rails", "4.1.16"
 end
 
 appraise "rails-4-2-mysql" do
+  gemspec
   gem "mysql2"
-  gem "rails", "4.2.9"
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-mysql" do
+  gemspec
   gem "mysql2"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
-  gem "activesupport", "~> 5.0.0"
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-mysql" do
+  gemspec
   gem "mysql2"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-0-pgsql" do
-  gem "pg"
-  gem "rails", "4.0.13"
+appraise "rails-5-2-mysql" do
+  gemspec
+  gem "mysql2"
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-1-pgsql" do
-  gem "pg"
-  gem "rails", "4.1.16"
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-mysql" do
+    gemspec
+    gem "mysql2"
+    gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git'
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'rails', '6.0.0.rc1'
+    gem 'rspec-rails'
+  end
+end
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-pgsql" do
+    gemspec
+    gem "pg", '~> 0.21.0'
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
+  appraise "rails-4-1-pgsql" do
+    gemspec
+    gem "pg", '~> 0.21.0'
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
 end
 
 appraise "rails-4-2-pgsql" do
-  gem "pg"
-  gem "rails", "4.2.9"
+  gemspec
+  gem "pg", '~> 0.21.0'
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-pgsql" do
+  gemspec
   gem "pg"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-pgsql" do
+  gemspec
   gem "pg"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-0-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.0.13"
+appraise "rails-5-2-pgsql" do
+  gemspec
+  gem "pg"
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-1-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.1.16"
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-pgsql" do
+    gemspec
+    gem "pg"
+    gem 'rails', '6.0.0.rc1'
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'activemodel', '6.0.0.rc1'
+    gem 'activerecord', '6.0.0.rc1'
+    gem 'activesupport', '6.0.0.rc1'
+    gem 'railties', '6.0.0.rc1'
+    gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git'
+    gem 'rspec-rails'
+  end
+end
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-sqlite" do
+    gemspec
+    gem "sqlite3", '~> 1.3.13'
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
+  appraise "rails-4-1-sqlite" do
+    gemspec
+    gem "sqlite3", '~> 1.3.13'
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
 end
 
 appraise "rails-4-2-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.2.9"
+  gemspec
+  gem "sqlite3", '~> 1.3.13'
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-sqlite" do
-  gem "sqlite3"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
-  gem "activesupport", "~> 5.0.0"
+  gemspec
+  gem "sqlite3", '~> 1.3.13'
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-sqlite" do
+  gemspec
+  gem "sqlite3"
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
+end
+
+appraise "rails-5-2-sqlite" do
+  gemspec
   gem "sqlite3"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: 'git@github.com:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
+end
+
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-sqlite" do
+    gemspec
+    gem "sqlite3"
+    gem 'rails', '6.0.0.rc1'
+
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'activemodel', '6.0.0.rc1'
+    gem 'activerecord', '6.0.0.rc1'
+    gem 'activesupport', '6.0.0.rc1'
+    gem 'railties', '6.0.0.rc1'
+    gem 'awesome_nested_set', git: 'git@github.com:collectiveidea/awesome_nested_set.git'
+    gem 'rspec-rails'
+  end
 end
diff --git a/Gemfile b/Gemfile
index f6b137b..b128472 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Declare your gem's dependencies in nocms-blocks.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
-gemspec
+# gemspec
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
@@ -22,10 +22,9 @@ group :development, :test do
 end
 
 group :test do
-  gem 'rspec-rails', '~> 3.5.0.beta'
   gem 'capybara-screenshot'
   gem 'factory_girl'
-  gem 'capybara'
+  gem 'capybara', '< 3.16'
   gem 'database_cleaner'
   gem 'faker'
   gem 'carrierwave' # For development and testing purposes (Images)
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a98cdc..2b8ddce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,231 +1,150 @@
-PATH
-  remote: .
-  specs:
-    nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
-      awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       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.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activeresource (4.1.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.2)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.2)
-    byebug (9.0.6)
-    capybara (2.10.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.14)
-      capybara (>= 1.0, < 3)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (0.11.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-      mimemagic (>= 0.3.0)
-    coderay (1.1.1)
-    concurrent-ruby (1.1.4)
-    database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    factory_girl (4.7.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.6.6)
-      i18n (~> 0.5)
-    generator_spec (0.9.3)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (0.8.2)
-    mime-types (3.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
+    mime-types-data (3.2019.0331)
     mini_mime (1.0.1)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    pry (0.10.4)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.4)
-    rack (1.6.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      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.3)
-      loofah (~> 2.0)
-    rails-observers (0.1.5)
-      activemodel (>= 4.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    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.12)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  nocms-blocks!
   pry-byebug
   pry-nav
   pry-rails
   pry-remote
   pry-stack_explorer
-  rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.17.3
diff --git a/app/models/no_cms/blocks/concerns/translation_scopes.rb b/app/models/no_cms/blocks/concerns/translation_scopes.rb
index 22abd41..6373375 100644
--- a/app/models/no_cms/blocks/concerns/translation_scopes.rb
+++ b/app/models/no_cms/blocks/concerns/translation_scopes.rb
@@ -6,7 +6,16 @@ module TranslationScopes
 
         included do
           scope :where_with_locale, ->(where_params, locale = ::I18n.locale) {
-            with_translations(locale).where(self::Translation.table_name => where_params)
+            # In Rails 5.2 "self" doesn't return the model itself but an
+            # ActiveRecord::Relation model that has no Translation. We have to
+            # use the `model` attribute
+            translation_model = if Rails.version >= "5.2.0"
+                self.model::Translation
+              else
+                self::Translation
+              end
+
+            with_translations(locale).where(translation_model.table_name => where_params)
           }
         end
 
diff --git a/blocks.gemspec b/blocks.gemspec
index d2d9833..0b49b9d 100644
--- a/blocks.gemspec
+++ b/blocks.gemspec
@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", ">= 4.0.0", '< 5.2'
-  s.add_dependency "activeresource", ">= 4.0.0", '< 5.2'
-  s.add_dependency "globalize", '>= 4.0.0', '< 5.2'
+  s.add_dependency "rails", ">= 4.0.0", '< 6.1'
+  s.add_dependency "activeresource", ">= 4.0.0", '< 6.1'
+  s.add_dependency "globalize", '>= 4.0.0', '< 5.4'
   s.add_dependency "awesome_nested_set", '>= 3.0.0', '< 3.2'
 
-  s.add_development_dependency "sqlite3"
 end
diff --git a/gemfiles/rails_4_0_mysql.gemfile b/gemfiles/rails_4_0_mysql.gemfile
index e0838e6..117aa0b 100644
--- a/gemfiles/rails_4_0_mysql.gemfile
+++ b/gemfiles/rails_4_0_mysql.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "mysql2", "~> 0.3.10"
 gem "rails", "4.0.13"
+gem "rspec-rails", "3.5.0"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock
index 599e39d..2a250d4 100644
--- a/gemfiles/rails_4_0_mysql.gemfile.lock
+++ b/gemfiles/rails_4_0_mysql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,85 +38,85 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (4.0.2)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
-    json (2.1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (4.7.5)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     mysql2 (0.3.21)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -135,7 +135,7 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -144,7 +144,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+    rspec-rails (3.5.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -153,35 +153,34 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (0.3.53)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    tzinfo (0.3.55)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -196,10 +195,9 @@ DEPENDENCIES
   pry-remote
   pry-stack_explorer
   rails (= 4.0.13)
-  rspec-rails (~> 3.5.0.beta)
+  rspec-rails (= 3.5.0)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_0_pgsql.gemfile b/gemfiles/rails_4_0_pgsql.gemfile
index fa13fe4..aa090da 100644
--- a/gemfiles/rails_4_0_pgsql.gemfile
+++ b/gemfiles/rails_4_0_pgsql.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "pg"
+gem "pg", "~> 0.21.0"
 gem "rails", "4.0.13"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock
index 35b0abf..c4e4c99 100644
--- a/gemfiles/rails_4_0_pgsql.gemfile.lock
+++ b/gemfiles/rails_4_0_pgsql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,85 +38,85 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (4.0.2)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
-    json (2.1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (4.7.5)
-    multi_json (1.12.1)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    multi_json (1.13.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pg (0.21.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -135,7 +135,7 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -153,35 +153,34 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (0.3.53)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    tzinfo (0.3.55)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -189,7 +188,7 @@ DEPENDENCIES
   faker
   generator_spec
   nocms-blocks!
-  pg
+  pg (~> 0.21.0)
   pry-byebug
   pry-nav
   pry-rails
@@ -199,7 +198,6 @@ DEPENDENCIES
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_0_sqlite.gemfile b/gemfiles/rails_4_0_sqlite.gemfile
index 76ff0fa..01fbc8e 100644
--- a/gemfiles/rails_4_0_sqlite.gemfile
+++ b/gemfiles/rails_4_0_sqlite.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.13"
 gem "rails", "4.0.13"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock
index 0813e7b..016b8a1 100644
--- a/gemfiles/rails_4_0_sqlite.gemfile.lock
+++ b/gemfiles/rails_4_0_sqlite.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,84 +38,84 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (4.0.2)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
-    json (2.1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (4.7.5)
-    multi_json (1.12.1)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    multi_json (1.13.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -134,7 +134,7 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -152,16 +152,16 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -169,18 +169,18 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (0.3.53)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    tzinfo (0.3.55)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -197,7 +197,7 @@ DEPENDENCIES
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
+  sqlite3 (~> 1.3.13)
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_1_mysql.gemfile b/gemfiles/rails_4_1_mysql.gemfile
index a56ca1c..e817c41 100644
--- a/gemfiles/rails_4_1_mysql.gemfile
+++ b/gemfiles/rails_4_1_mysql.gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "mysql2", "~> 0.3.13"
 gem "rails", "4.1.16"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock
index 45c210c..dabb53e 100644
--- a/gemfiles/rails_4_1_mysql.gemfile.lock
+++ b/gemfiles/rails_4_1_mysql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -40,84 +40,84 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
     mysql2 (0.3.21)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -138,7 +138,7 @@ GEM
       activesupport (= 4.1.16)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -156,36 +156,35 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -203,7 +202,6 @@ DEPENDENCIES
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_1_pgsql.gemfile b/gemfiles/rails_4_1_pgsql.gemfile
index 17cbbc7..6b3a05b 100644
--- a/gemfiles/rails_4_1_pgsql.gemfile
+++ b/gemfiles/rails_4_1_pgsql.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "pg"
+gem "pg", "~> 0.21.0"
 gem "rails", "4.1.16"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock
index 4c2fd7e..efbb6cc 100644
--- a/gemfiles/rails_4_1_pgsql.gemfile.lock
+++ b/gemfiles/rails_4_1_pgsql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -40,84 +40,84 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pg (0.21.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -138,7 +138,7 @@ GEM
       activesupport (= 4.1.16)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -156,36 +156,35 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -193,7 +192,7 @@ DEPENDENCIES
   faker
   generator_spec
   nocms-blocks!
-  pg
+  pg (~> 0.21.0)
   pry-byebug
   pry-nav
   pry-rails
@@ -203,7 +202,6 @@ DEPENDENCIES
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_1_sqlite.gemfile b/gemfiles/rails_4_1_sqlite.gemfile
index 7bf3c1d..6a285e1 100644
--- a/gemfiles/rails_4_1_sqlite.gemfile
+++ b/gemfiles/rails_4_1_sqlite.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.13"
 gem "rails", "4.1.16"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock
index 8bbec24..283fbcd 100644
--- a/gemfiles/rails_4_1_sqlite.gemfile.lock
+++ b/gemfiles/rails_4_1_sqlite.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -40,83 +40,83 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    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)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    i18n (0.8.6)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -137,7 +137,7 @@ GEM
       activesupport (= 4.1.16)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -155,16 +155,16 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -172,19 +172,19 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
@@ -201,7 +201,7 @@ DEPENDENCIES
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
+  sqlite3 (~> 1.3.13)
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_2_mysql.gemfile b/gemfiles/rails_4_2_mysql.gemfile
index 4e1ae76..f3afb90 100644
--- a/gemfiles/rails_4_2_mysql.gemfile
+++ b/gemfiles/rails_4_2_mysql.gemfile
@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "mysql2"
-gem "rails", "4.2.9"
+gem "rails", "4.2.11.1"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock
index 4c5af03..4fb78f4 100644
--- a/gemfiles/rails_4_2_mysql.gemfile.lock
+++ b/gemfiles/rails_4_2_mysql.gemfile.lock
@@ -2,164 +2,171 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       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.9)
-      activesupport (= 4.2.9)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
     activeresource (4.1.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.2)
-    activesupport (4.2.9)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    mysql2 (0.4.8)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mysql2 (0.5.2)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (1.6.8)
+    public_suffix (3.1.0)
+    rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -177,42 +184,42 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
+  globalize (~> 5.2.0)
   mysql2
   nocms-blocks!
   pry-byebug
@@ -220,11 +227,10 @@ DEPENDENCIES
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 4.2.9)
+  rails (= 4.2.11.1)
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_2_pgsql.gemfile b/gemfiles/rails_4_2_pgsql.gemfile
index d600023..19f81a4 100644
--- a/gemfiles/rails_4_2_pgsql.gemfile
+++ b/gemfiles/rails_4_2_pgsql.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "pg"
-gem "rails", "4.2.9"
+gem "pg", "~> 0.21.0"
+gem "rails", "4.2.11.1"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock
index 55618ab..515d47c 100644
--- a/gemfiles/rails_4_2_pgsql.gemfile.lock
+++ b/gemfiles/rails_4_2_pgsql.gemfile.lock
@@ -2,164 +2,171 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       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.9)
-      activesupport (= 4.2.9)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
     activeresource (4.1.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.2)
-    activesupport (4.2.9)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pg (0.21.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (1.6.8)
+    public_suffix (3.1.0)
+    rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -177,54 +184,53 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
+  globalize (~> 5.2.0)
   nocms-blocks!
-  pg
+  pg (~> 0.21.0)
   pry-byebug
   pry-nav
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 4.2.9)
+  rails (= 4.2.11.1)
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_4_2_sqlite.gemfile b/gemfiles/rails_4_2_sqlite.gemfile
index cef1d39..3276ad5 100644
--- a/gemfiles/rails_4_2_sqlite.gemfile
+++ b/gemfiles/rails_4_2_sqlite.gemfile
@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "rails", "4.2.9"
+gem "sqlite3", "~> 1.3.13"
+gem "rails", "4.2.11.1"
+gem "rspec-rails", "~> 3.5.0.beta"
 
 group :development, :test do
   gem "pry-rails"
@@ -14,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock
index 743d7bc..a40751b 100644
--- a/gemfiles/rails_4_2_sqlite.gemfile.lock
+++ b/gemfiles/rails_4_2_sqlite.gemfile.lock
@@ -2,163 +2,170 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       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.9)
-      activesupport (= 4.2.9)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
     activeresource (4.1.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.2)
-    activesupport (4.2.9)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (1.6.8)
+    public_suffix (3.1.0)
+    rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -176,53 +183,54 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
+  globalize (~> 5.2.0)
   nocms-blocks!
   pry-byebug
   pry-nav
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 4.2.9)
+  rails (= 4.2.11.1)
   rspec-rails (~> 3.5.0.beta)
   simplecov
   simplecov-json
-  sqlite3
+  sqlite3 (~> 1.3.13)
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_5_0_mysql.gemfile b/gemfiles/rails_5_0_mysql.gemfile
index 895550f..d0c4e3c 100644
--- a/gemfiles/rails_5_0_mysql.gemfile
+++ b/gemfiles/rails_5_0_mysql.gemfile
@@ -3,12 +3,9 @@
 source "https://rubygems.org"
 
 gem "mysql2"
-gem "rails", "5.0.5"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
-gem "activesupport", "~> 5.0.0"
+gem "rails", "5.0.7.2"
 gem "awesome_nested_set", "~> 3.1.1"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -19,10 +16,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_0_mysql.gemfile.lock b/gemfiles/rails_5_0_mysql.gemfile.lock
index 3aa262e..33d1068 100644
--- a/gemfiles/rails_5_0_mysql.gemfile.lock
+++ b/gemfiles/rails_5_0_mysql.gemfile.lock
@@ -1,251 +1,233 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
-  remote: ../
+  remote: ..
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.5)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    mysql2 (0.4.8)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mysql2 (0.5.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       bundler (>= 1.3.0)
-      railties (= 5.0.5)
+      railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
-  activesupport (~> 5.0.0)
   appraisal
   awesome_nested_set (~> 3.1.1)
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
   mysql2
   nocms-blocks!
   pry-byebug
@@ -253,12 +235,10 @@ DEPENDENCIES
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.0.5)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.0.7.2)
+  rspec-rails
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.17.3
diff --git a/gemfiles/rails_5_0_pgsql.gemfile b/gemfiles/rails_5_0_pgsql.gemfile
index 7e53700..cc61029 100644
--- a/gemfiles/rails_5_0_pgsql.gemfile
+++ b/gemfiles/rails_5_0_pgsql.gemfile
@@ -3,11 +3,9 @@
 source "https://rubygems.org"
 
 gem "pg"
-gem "rails", "5.0.5"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
+gem "rails", "5.0.7.2"
 gem "awesome_nested_set", "~> 3.1.1"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -18,10 +16,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_0_pgsql.gemfile.lock b/gemfiles/rails_5_0_pgsql.gemfile.lock
index 34d3bb7..7ed257e 100644
--- a/gemfiles/rails_5_0_pgsql.gemfile.lock
+++ b/gemfiles/rails_5_0_pgsql.gemfile.lock
@@ -1,250 +1,234 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.5)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pg (0.21.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       bundler (>= 1.3.0)
-      railties (= 5.0.5)
+      railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
   appraisal
   awesome_nested_set (~> 3.1.1)
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
+  globalize (~> 5.2.0)
   nocms-blocks!
   pg
   pry-byebug
@@ -252,12 +236,10 @@ DEPENDENCIES
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.0.5)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.0.7.2)
+  rspec-rails
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_5_0_sqlite.gemfile b/gemfiles/rails_5_0_sqlite.gemfile
index 80959ff..b651bb5 100644
--- a/gemfiles/rails_5_0_sqlite.gemfile
+++ b/gemfiles/rails_5_0_sqlite.gemfile
@@ -2,13 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3"
-gem "rails", "5.0.5"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
-gem "activesupport", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.13"
+gem "rails", "5.0.7.2"
 gem "awesome_nested_set", "~> 3.1.1"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -19,10 +16,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_0_sqlite.gemfile.lock b/gemfiles/rails_5_0_sqlite.gemfile.lock
index 51b2ec1..9749c3f 100644
--- a/gemfiles/rails_5_0_sqlite.gemfile.lock
+++ b/gemfiles/rails_5_0_sqlite.gemfile.lock
@@ -1,262 +1,245 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.5)
-      actionpack (= 5.0.5)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
-      actionview (= 5.0.5)
-      activesupport (= 5.0.5)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
-      activesupport (= 5.0.5)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.5)
-      activesupport (= 5.0.5)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.5)
-      activesupport (= 5.0.5)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.0.5)
-      activemodel (= 5.0.5)
-      activesupport (= 5.0.5)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activesupport (5.0.5)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.5)
-      actioncable (= 5.0.5)
-      actionmailer (= 5.0.5)
-      actionpack (= 5.0.5)
-      actionview (= 5.0.5)
-      activejob (= 5.0.5)
-      activemodel (= 5.0.5)
-      activerecord (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       bundler (>= 1.3.0)
-      railties (= 5.0.5)
+      railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.5)
-      actionpack (= 5.0.5)
-      activesupport (= 5.0.5)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
-  activesupport (~> 5.0.0)
   appraisal
   awesome_nested_set (~> 3.1.1)
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
+  globalize (~> 5.2.0)
   nocms-blocks!
   pry-byebug
   pry-nav
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.0.5)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.0.7.2)
+  rspec-rails
   simplecov
   simplecov-json
-  sqlite3
+  sqlite3 (~> 1.3.13)
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_5_1_mysql.gemfile b/gemfiles/rails_5_1_mysql.gemfile
index 4097fdc..7c932d5 100644
--- a/gemfiles/rails_5_1_mysql.gemfile
+++ b/gemfiles/rails_5_1_mysql.gemfile
@@ -3,10 +3,8 @@
 source "https://rubygems.org"
 
 gem "mysql2"
-gem "rails", "5.1.3"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
+gem "rails", "5.1.7"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -17,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_1_mysql.gemfile.lock b/gemfiles/rails_5_1_mysql.gemfile.lock
index 0300786..e80ee0c 100644
--- a/gemfiles/rails_5_1_mysql.gemfile.lock
+++ b/gemfiles/rails_5_1_mysql.gemfile.lock
@@ -1,249 +1,233 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.3)
-      actionpack (= 5.1.3)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.3)
-      actionview (= 5.1.3)
-      activesupport (= 5.1.3)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.3)
-      activesupport (= 5.1.3)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.3)
-      activesupport (= 5.1.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.1.3)
-      activesupport (= 5.1.3)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.1.3)
-      activemodel (= 5.1.3)
-      activesupport (= 5.1.3)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.3)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.6.1)
-    factory_girl (4.8.0)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    mysql2 (0.4.8)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mysql2 (0.5.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.3)
-      actioncable (= 5.1.3)
-      actionmailer (= 5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
-      activemodel (= 5.1.3)
-      activerecord (= 5.1.3)
-      activesupport (= 5.1.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.1.3)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.3)
-      actionpack (= 5.1.3)
-      activesupport (= 5.1.3)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
+  globalize (~> 5.2.0)
   mysql2
   nocms-blocks!
   pry-byebug
@@ -251,12 +235,10 @@ DEPENDENCIES
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.1.3)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.1.7)
+  rspec-rails
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_5_1_pgsql.gemfile b/gemfiles/rails_5_1_pgsql.gemfile
index fed2d16..1ea8ba9 100644
--- a/gemfiles/rails_5_1_pgsql.gemfile
+++ b/gemfiles/rails_5_1_pgsql.gemfile
@@ -3,10 +3,8 @@
 source "https://rubygems.org"
 
 gem "pg"
-gem "rails", "5.1.3"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
+gem "rails", "5.1.7"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -17,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_1_pgsql.gemfile.lock b/gemfiles/rails_5_1_pgsql.gemfile.lock
index 07a4011..f1e9801 100644
--- a/gemfiles/rails_5_1_pgsql.gemfile.lock
+++ b/gemfiles/rails_5_1_pgsql.gemfile.lock
@@ -1,249 +1,233 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.3)
-      actionpack (= 5.1.3)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.3)
-      actionview (= 5.1.3)
-      activesupport (= 5.1.3)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.3)
-      activesupport (= 5.1.3)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.3)
-      activesupport (= 5.1.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.1.3)
-      activesupport (= 5.1.3)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.1.3)
-      activemodel (= 5.1.3)
-      activesupport (= 5.1.3)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.3)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.6.1)
-    factory_girl (4.8.0)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pg (0.21.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.3)
-      actioncable (= 5.1.3)
-      actionmailer (= 5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
-      activemodel (= 5.1.3)
-      activerecord (= 5.1.3)
-      activesupport (= 5.1.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.1.3)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.3)
-      actionpack (= 5.1.3)
-      activesupport (= 5.1.3)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
+  globalize (~> 5.2.0)
   nocms-blocks!
   pg
   pry-byebug
@@ -251,12 +235,10 @@ DEPENDENCIES
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.1.3)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.1.7)
+  rspec-rails
   simplecov
   simplecov-json
-  sqlite3
 
 BUNDLED WITH
    1.13.6
diff --git a/gemfiles/rails_5_1_sqlite.gemfile b/gemfiles/rails_5_1_sqlite.gemfile
index 2f2de90..d25cec5 100644
--- a/gemfiles/rails_5_1_sqlite.gemfile
+++ b/gemfiles/rails_5_1_sqlite.gemfile
@@ -3,10 +3,8 @@
 source "https://rubygems.org"
 
 gem "sqlite3"
-gem "rails", "5.1.3"
-gem "globalize", git: "git@github.com:globalize/globalize.git", branch: "master"
-gem "rails-observers", github: "rails/rails-observers"
-gem "activeresource", github: "rails/activeresource"
+gem "rails", "5.1.7"
+gem "rspec-rails"
 
 group :development, :test do
   gem "pry-rails"
@@ -17,10 +15,9 @@ group :development, :test do
 end
 
 group :test do
-  gem "rspec-rails", "~> 3.5.0.beta"
   gem "capybara-screenshot"
   gem "factory_girl"
-  gem "capybara"
+  gem "capybara", "< 3.16"
   gem "database_cleaner"
   gem "faker"
   gem "carrierwave"
diff --git a/gemfiles/rails_5_1_sqlite.gemfile.lock b/gemfiles/rails_5_1_sqlite.gemfile.lock
index 1837d7a..4e91867 100644
--- a/gemfiles/rails_5_1_sqlite.gemfile.lock
+++ b/gemfiles/rails_5_1_sqlite.gemfile.lock
@@ -1,257 +1,241 @@
-GIT
-  remote: git://github.com/rails/activeresource.git
-  revision: 505825bd1ae5c4100f1571d0842a9a99f471f87a
-  specs:
-    activeresource (5.0.0)
-      activemodel (>= 5.0, < 6)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 6)
-
-GIT
-  remote: git://github.com/rails/rails-observers.git
-  revision: c569dc1525259f5ab82cddf90958777473499997
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
-GIT
-  remote: git@github.com:globalize/globalize.git
-  revision: ce823d437b38472365adc01a6a46f5e1bf6a4080
-  branch: master
-  specs:
-    globalize (5.1.0.beta2)
-      activemodel (>= 4.2, < 5.2)
-      activerecord (>= 4.2, < 5.2)
-      request_store (~> 1.0)
-
 PATH
   remote: ../
   specs:
     nocms-blocks (1.2.0)
-      activeresource (>= 4.0.0, < 5.2)
+      activeresource (>= 4.0.0, < 6.1)
       awesome_nested_set (>= 3.0.0, < 3.2)
-      globalize (>= 4.0.0, < 5.2)
-      rails (>= 4.0.0, < 5.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.3)
-      actionpack (= 5.1.3)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.3)
-      actionview (= 5.1.3)
-      activesupport (= 5.1.3)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.3)
-      activesupport (= 5.1.3)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.3)
-      activesupport (= 5.1.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.1.3)
-      activesupport (= 5.1.3)
-    activemodel-serializers-xml (1.0.1)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
-      activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.1.3)
-      activemodel (= 5.1.3)
-      activesupport (= 5.1.3)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activesupport (5.1.3)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    awesome_nested_set (3.1.3)
-      activerecord (>= 4.0.0, < 5.2)
-    binding_of_caller (0.7.2)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
+    byebug (11.0.1)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.1.0)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.6.1)
-    factory_girl (4.8.0)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.9.3)
+      i18n (>= 0.7)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.4.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.3)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pry (0.10.4)
+    mime-types-data (3.2019.0331)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.6)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.3)
-      actioncable (= 5.1.3)
-      actionmailer (= 5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
-      activemodel (= 5.1.3)
-      activerecord (= 5.1.3)
-      activesupport (= 5.1.3)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.1.3)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.3)
-      actionpack (= 5.1.3)
-      activesupport (= 5.1.3)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     simplecov-json (0.2)
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource!
   appraisal
-  capybara
+  capybara (< 3.16)
   capybara-screenshot
   carrierwave
   database_cleaner
   factory_girl
   faker
   generator_spec
-  globalize!
+  globalize (~> 5.2.0)
   nocms-blocks!
   pry-byebug
   pry-nav
   pry-rails
   pry-remote
   pry-stack_explorer
-  rails (= 5.1.3)
-  rails-observers!
-  rspec-rails (~> 3.5.0.beta)
+  rails (= 5.1.7)
+  rspec-rails
   simplecov
   simplecov-json
   sqlite3
diff --git a/gemfiles/rails_5_2_mysql.gemfile b/gemfiles/rails_5_2_mysql.gemfile
new file mode 100644
index 0000000..d03a6c1
--- /dev/null
+++ b/gemfiles/rails_5_2_mysql.gemfile
@@ -0,0 +1,30 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2"
+gem "rails", "5.2.3"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5_2_mysql.gemfile.lock b/gemfiles/rails_5_2_mysql.gemfile.lock
new file mode 100644
index 0000000..294a4d1
--- /dev/null
+++ b/gemfiles/rails_5_2_mysql.gemfile.lock
@@ -0,0 +1,252 @@
+PATH
+  remote: ../
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mysql2 (0.5.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  globalize (~> 5.2.0)
+  mysql2
+  nocms-blocks!
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 5.2.3)
+  rspec-rails
+  simplecov
+  simplecov-json
+
+BUNDLED WITH
+   1.13.6
diff --git a/gemfiles/rails_5_2_pgsql.gemfile b/gemfiles/rails_5_2_pgsql.gemfile
new file mode 100644
index 0000000..f10d5cd
--- /dev/null
+++ b/gemfiles/rails_5_2_pgsql.gemfile
@@ -0,0 +1,30 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pg"
+gem "rails", "5.2.3"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5_2_pgsql.gemfile.lock b/gemfiles/rails_5_2_pgsql.gemfile.lock
new file mode 100644
index 0000000..341ba7e
--- /dev/null
+++ b/gemfiles/rails_5_2_pgsql.gemfile.lock
@@ -0,0 +1,252 @@
+PATH
+  remote: ../
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  globalize (~> 5.2.0)
+  nocms-blocks!
+  pg
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 5.2.3)
+  rspec-rails
+  simplecov
+  simplecov-json
+
+BUNDLED WITH
+   1.13.6
diff --git a/gemfiles/rails_5_2_sqlite.gemfile b/gemfiles/rails_5_2_sqlite.gemfile
new file mode 100644
index 0000000..aa71d75
--- /dev/null
+++ b/gemfiles/rails_5_2_sqlite.gemfile
@@ -0,0 +1,30 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "rails", "5.2.3"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5_2_sqlite.gemfile.lock b/gemfiles/rails_5_2_sqlite.gemfile.lock
new file mode 100644
index 0000000..88fe287
--- /dev/null
+++ b/gemfiles/rails_5_2_sqlite.gemfile.lock
@@ -0,0 +1,252 @@
+PATH
+  remote: ../
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  globalize (~> 5.2.0)
+  nocms-blocks!
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 5.2.3)
+  rspec-rails
+  simplecov
+  simplecov-json
+  sqlite3
+
+BUNDLED WITH
+   1.13.6
diff --git a/gemfiles/rails_6_rc_mysql.gemfile b/gemfiles/rails_6_rc_mysql.gemfile
new file mode 100644
index 0000000..2a7efa0
--- /dev/null
+++ b/gemfiles/rails_6_rc_mysql.gemfile
@@ -0,0 +1,32 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2"
+gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git"
+gem "actionpack", "6.0.0.rc1"
+gem "rails", "6.0.0.rc1"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6_rc_mysql.gemfile.lock b/gemfiles/rails_6_rc_mysql.gemfile.lock
new file mode 100644
index 0000000..7d57fe1
--- /dev/null
+++ b/gemfiles/rails_6_rc_mysql.gemfile.lock
@@ -0,0 +1,274 @@
+GIT
+  remote: git@github.com:collectiveidea/awesome_nested_set.git
+  revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123
+  specs:
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0)
+
+PATH
+  remote: ..
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actiontext (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.3.0)
+      activemodel (>= 4.2, < 6.1)
+      activerecord (>= 4.2, < 6.1)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mysql2 (0.5.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0.rc1)
+      actioncable (= 6.0.0.rc1)
+      actionmailbox (= 6.0.0.rc1)
+      actionmailer (= 6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actiontext (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.rc1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 6.0.0.rc1)
+  appraisal
+  awesome_nested_set!
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  mysql2
+  nocms-blocks!
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 6.0.0.rc1)
+  rspec-rails
+  simplecov
+  simplecov-json
+
+BUNDLED WITH
+   1.17.3
diff --git a/gemfiles/rails_6_rc_pgsql.gemfile b/gemfiles/rails_6_rc_pgsql.gemfile
new file mode 100644
index 0000000..ab37ee4
--- /dev/null
+++ b/gemfiles/rails_6_rc_pgsql.gemfile
@@ -0,0 +1,36 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pg"
+gem "rails", "6.0.0.rc1"
+gem "actionpack", "6.0.0.rc1"
+gem "activemodel", "6.0.0.rc1"
+gem "activerecord", "6.0.0.rc1"
+gem "activesupport", "6.0.0.rc1"
+gem "railties", "6.0.0.rc1"
+gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6_rc_pgsql.gemfile.lock b/gemfiles/rails_6_rc_pgsql.gemfile.lock
new file mode 100644
index 0000000..84d7eb7
--- /dev/null
+++ b/gemfiles/rails_6_rc_pgsql.gemfile.lock
@@ -0,0 +1,278 @@
+GIT
+  remote: git@github.com:collectiveidea/awesome_nested_set.git
+  revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123
+  specs:
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0)
+
+PATH
+  remote: ..
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actiontext (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.3.0)
+      activemodel (>= 4.2, < 6.1)
+      activerecord (>= 4.2, < 6.1)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0.rc1)
+      actioncable (= 6.0.0.rc1)
+      actionmailbox (= 6.0.0.rc1)
+      actionmailer (= 6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actiontext (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.rc1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 6.0.0.rc1)
+  activemodel (= 6.0.0.rc1)
+  activerecord (= 6.0.0.rc1)
+  activesupport (= 6.0.0.rc1)
+  appraisal
+  awesome_nested_set!
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  nocms-blocks!
+  pg
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 6.0.0.rc1)
+  railties (= 6.0.0.rc1)
+  rspec-rails
+  simplecov
+  simplecov-json
+
+BUNDLED WITH
+   1.17.3
diff --git a/gemfiles/rails_6_rc_sqlite.gemfile b/gemfiles/rails_6_rc_sqlite.gemfile
new file mode 100644
index 0000000..ea24529
--- /dev/null
+++ b/gemfiles/rails_6_rc_sqlite.gemfile
@@ -0,0 +1,36 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "rails", "6.0.0.rc1"
+gem "actionpack", "6.0.0.rc1"
+gem "activemodel", "6.0.0.rc1"
+gem "activerecord", "6.0.0.rc1"
+gem "activesupport", "6.0.0.rc1"
+gem "railties", "6.0.0.rc1"
+gem "awesome_nested_set", git: "git@github.com:collectiveidea/awesome_nested_set.git"
+gem "rspec-rails"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-byebug"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara", "< 3.16"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6_rc_sqlite.gemfile.lock b/gemfiles/rails_6_rc_sqlite.gemfile.lock
new file mode 100644
index 0000000..8cdc63a
--- /dev/null
+++ b/gemfiles/rails_6_rc_sqlite.gemfile.lock
@@ -0,0 +1,278 @@
+GIT
+  remote: git@github.com:collectiveidea/awesome_nested_set.git
+  revision: cf79fb63bcfe0f91df91147269f3a2c9a62eb123
+  specs:
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0)
+
+PATH
+  remote: ..
+  specs:
+    nocms-blocks (1.2.0)
+      activeresource (>= 4.0.0, < 6.1)
+      awesome_nested_set (>= 3.0.0, < 3.2)
+      globalize (>= 4.0.0, < 5.4)
+      rails (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actiontext (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activeresource (5.1.0)
+      activemodel (>= 5.0, < 7)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 7)
+    activestorage (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
+      launchy
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    erubi (1.8.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.3.0)
+      activemodel (>= 4.2, < 6.1)
+      activerecord (>= 4.2, < 6.1)
+      request_store (~> 1.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0.rc1)
+      actioncable (= 6.0.0.rc1)
+      actionmailbox (= 6.0.0.rc1)
+      actionmailer (= 6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actiontext (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.rc1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.5.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov-json (0.2)
+      json
+      simplecov
+    slop (3.6.0)
+    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.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 6.0.0.rc1)
+  activemodel (= 6.0.0.rc1)
+  activerecord (= 6.0.0.rc1)
+  activesupport (= 6.0.0.rc1)
+  appraisal
+  awesome_nested_set!
+  capybara (< 3.16)
+  capybara-screenshot
+  carrierwave
+  database_cleaner
+  factory_girl
+  faker
+  generator_spec
+  nocms-blocks!
+  pry-byebug
+  pry-nav
+  pry-rails
+  pry-remote
+  pry-stack_explorer
+  rails (= 6.0.0.rc1)
+  railties (= 6.0.0.rc1)
+  rspec-rails
+  simplecov
+  simplecov-json
+  sqlite3
+
+BUNDLED WITH
+   1.17.3
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index 35e97e8..8b3aba7 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -18,6 +18,10 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.available_locales = [:en, :es, :fr, :pt, :de, :ca, :it]
+
+    if NoCms::Blocks.installed_db_gem == "sqlite3" && Rails.version >= "5.2.0"
+      Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
   end
 end