diff --git a/Gemfile.lock b/Gemfile.lock
index 7edd38f7f..f381c3893 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,12 +6,12 @@ PATH
       ancestry (~> 2.0.0)
       bootstrap-sass
       ckeditor_rails (~> 4.3.0)
-      compass-rails (~> 1.1.3)
+      compass-rails (~> 2.0.4)
       devise (~> 3.0)
       jquery-rails (~> 3.1)
       jquery-ui-rails (~> 4.1)
       panoramic
-      paperclip (~> 3.4)
+      paperclip (~> 4.3)
       rails (~> 4.0.0)
       sass-rails
       simple_form (>= 3.0.0.rc, < 3.1)
@@ -57,10 +57,14 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.7)
+    autoprefixer-rails (6.1.0.1)
+      execjs
+      json
+    bcrypt (3.1.10)
     bluecloth (2.2.0)
-    bootstrap-sass (3.2.0.2)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     builder (3.1.4)
     capybara (2.1.0)
       mime-types (>= 1.16)
@@ -70,28 +74,29 @@ GEM
       xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.1)
+    chunky_png (1.3.5)
     ckeditor_rails (4.3.4)
       railties (>= 3.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
-    compass (1.0.1)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.1)
+      compass-core (~> 1.0.2)
       compass-import-once (~> 1.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.1)
+    compass-core (1.0.3)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (1.1.7)
-      compass (>= 0.12.2)
-      sprockets (<= 2.11.0)
+    compass-rails (2.0.5)
+      compass (~> 1.0.0)
+      sass-rails (< 5.1)
+      sprockets (< 2.13)
     cucumber (1.3.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -104,10 +109,11 @@ GEM
       nokogiri (>= 1.5.0)
     daemons (1.1.9)
     database_cleaner (1.2.0)
-    devise (3.3.0)
+    devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.4)
@@ -122,18 +128,19 @@ GEM
       railties (>= 3.0.0)
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
-    ffi (1.9.0)
+    ffi (1.9.10)
     gherkin (2.12.1)
       multi_json (~> 1.3)
     hashie (2.0.5)
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    i18n (0.6.11)
-    jquery-rails (3.1.2)
+    i18n (0.7.0)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
+    json (1.8.3)
     launchy (2.3.0)
       addressable (~> 2.3)
     m (1.3.2)
@@ -145,6 +152,7 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.3.0)
     mini_portile (0.5.1)
     minitest (4.7.5)
     minitest-rails (0.9.2)
@@ -165,11 +173,12 @@ GEM
     orm_adapter (0.5.0)
     panoramic (0.0.4)
       rails (>= 3.0.7)
-    paperclip (3.5.4)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
+    paperclip (4.3.1)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
       mime-types
+      mimemagic (= 0.3.0)
     poltergeist (1.3.0)
       capybara (~> 2.1.0)
       faye-websocket (>= 0.4.4, < 0.5.0)
@@ -180,8 +189,8 @@ GEM
       hashie (>= 1.1.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.5.5)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.2)
       actionmailer (= 4.0.2)
@@ -196,24 +205,28 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    rb-fsevent (0.9.4)
+    rake (10.4.2)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     ruby-prof (0.13.0)
-    sass (3.4.5)
-    sass-rails (4.0.1)
+    sass (3.4.19)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     simple_form (3.1.0.rc2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     single_test (0.6.0)
       rake
-    sprockets (2.10.1)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -225,24 +238,24 @@ GEM
     sqlite3 (1.3.7)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.18.1)
-    thread_safe (0.3.4)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.3.3)
+    tins (1.7.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.45)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    underscore-rails (1.7.0)
+    underscore-rails (1.8.3)
     warden (1.2.3)
       rack (>= 1.0)
     will_paginate (3.0.7)
@@ -278,3 +291,6 @@ DEPENDENCIES
   thin
   uglifier
   yard
+
+BUNDLED WITH
+   1.10.6
diff --git a/app/assets/javascripts/bcms/ckeditor_load.js b/app/assets/javascripts/bcms/ckeditor_load.js
index 111dd5e6c..9e71b1178 100644
--- a/app/assets/javascripts/bcms/ckeditor_load.js
+++ b/app/assets/javascripts/bcms/ckeditor_load.js
@@ -3,21 +3,21 @@
 // Note: Uses noConflict version of jquery to avoid possible issues with loading ckeditor.
 jQuery(function ($) {
     $('textarea.editor').each(function (e) {
-        if (editorEnabled()) {
+        if (editorEnabled(this.id)) {
             loadEditor(this.id);
         }
     });
 });
 
-function editorEnabled() {
-    return $.cookie('editorEnabled') ? $.cookie('editorEnabled') == "true" : true;
+function editorEnabled(id) {
+    return $.cookie(cookieName(id)) ? $.cookie(cookieName(id)) == "true" : false;
 }
 
 function disableEditor(id) {
     if (typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
         $('#' + id).val(CKEDITOR.instances[id].getData()).show();
         CKEDITOR.instances[id].destroy();
-        $.cookie('editorEnabled', false, { expires:90, path:'/' });
+        $.cookie(cookieName(id), false, { expires:90, path:'/' });
     }
 }
 
@@ -25,7 +25,7 @@ function enableEditor(id) {
     if (typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
         CKEDITOR.instances[id].setData($('#' + id).val());
         $('#' + id).hide();
-        $.cookie('editorEnabled', true, { expires:90, path:'/' });
+        $.cookie(cookieName(id), true, { expires:90, path:'/' });
     }
 }
 
@@ -46,9 +46,13 @@ function loadEditor(id) {
             editor.config.width = '100%';
             editor.config.height = 400;
         }
-        $.cookie('editorEnabled', true, { expires:90, path:'/' });
+        $.cookie(cookieName(id), true, { expires:90, path:'/' });
         return true;
     } else {
         return false;
     }
-}
\ No newline at end of file
+}
+
+function cookieName(id) {
+    return 'editorEnabled_' + id + '_' + $('#' + id).data('path')
+}
diff --git a/app/assets/javascripts/cms/form_builder.js b/app/assets/javascripts/cms/form_builder.js
index 02e529164..f81015046 100644
--- a/app/assets/javascripts/cms/form_builder.js
+++ b/app/assets/javascripts/cms/form_builder.js
@@ -55,6 +55,7 @@ FormBuilder.prototype.confirmDeleteFormField = function() {
 FormBuilder.prototype.editFormField = function() {
   // This is the overall container for the entire field.
   formBuilder.field_being_editted = $(this).parents('.control-group');
+  $('#modal-edit-field').find('.modal-content').load($(this).attr('data-edit-path'));
   $('#modal-edit-field').modal({
     show: true,
     remote: $(this).attr('data-edit-path')
diff --git a/app/controllers/cms/content_block_controller.rb b/app/controllers/cms/content_block_controller.rb
index e88dfa168..277e34115 100644
--- a/app/controllers/cms/content_block_controller.rb
+++ b/app/controllers/cms/content_block_controller.rb
@@ -319,9 +319,9 @@ def check_permissions
         when "index", "show", "new", "create", "version", "versions"
           # Allow
         when "edit", "update", "inline"
-          raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@block)
+          raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@block)
         when "destroy", "publish", "revert_to"
-          raise Cms::Errors::AccessDenied unless current_user.able_to_publish?(@block)
+          raise Cms::Errors::AccessDenied unless current_cms_user.able_to_publish?(@block)
         else
           raise Cms::Errors::AccessDenied
       end
@@ -330,7 +330,7 @@ def check_permissions
     private
 
     def render_block_in_main_container
-      ensure_current_user_can_view(@block)
+      ensure_current_cms_user_can_view(@block)
       show_content_as_page(@block)
       render 'render_block_in_main_container', layout: @block.class.layout
     end
@@ -341,7 +341,7 @@ def render_block_in_content_library
 
     def render_editing_frame_or_block_in_main_container
       if @block.class.addressable?
-        if current_user.able_to_edit?(@block)
+        if current_cms_user.able_to_edit?(@block)
           render_toolbar_and_iframe
         else
           render_block_in_main_container
diff --git a/app/controllers/cms/content_controller.rb b/app/controllers/cms/content_controller.rb
index 58bed6dcb..cc32f1e04 100644
--- a/app/controllers/cms/content_controller.rb
+++ b/app/controllers/cms/content_controller.rb
@@ -47,7 +47,7 @@ def edit
     def preview
       @mode = "view"
       @page = Page.find_draft(params[:id].to_i)
-      ensure_current_user_can_view(@page)
+      ensure_current_cms_user_can_view(@page)
       render_page
     end
 
@@ -114,7 +114,7 @@ def redirect_non_cms_users_to_public_site
         logger.debug "Using cms subdomain is enabled"
         if request_is_for_cms_subdomain?
           logger.debug "User has required a page on the cms subdomain."
-          if current_user.able_to?(:edit_content, :publish_content, :administrate)
+          if current_cms_user.able_to?(:edit_content, :publish_content, :administrate)
             logger.debug "User has access to cms"
             @show_toolbar = true
           else
@@ -126,7 +126,7 @@ def redirect_non_cms_users_to_public_site
         end
       else
         logger.debug "Using cms subdomain is disabled"
-        if current_user.able_to?(:edit_content, :publish_content, :administrate)
+        if current_cms_user.able_to?(:edit_content, :publish_content, :administrate)
           @show_toolbar = true
         end
       end
@@ -157,7 +157,7 @@ def try_to_stream_file
     end
 
     def load_page
-      if current_user.able_to?(:edit_content, :publish_content, :administrate)
+      if current_cms_user.able_to?(:edit_content, :publish_content, :administrate)
         logger.debug "Displaying draft version of page"
         @page = Page.find_draft(@path)
       else
@@ -167,7 +167,7 @@ def load_page
     end
 
     def check_access_to_page
-      ensure_current_user_can_view(@page)
+      ensure_current_cms_user_can_view(@page)
     end
   end
 end
diff --git a/app/controllers/cms/dashboard_controller.rb b/app/controllers/cms/dashboard_controller.rb
index e58912840..9e105d241 100644
--- a/app/controllers/cms/dashboard_controller.rb
+++ b/app/controllers/cms/dashboard_controller.rb
@@ -3,8 +3,8 @@ class DashboardController < Cms::BaseController
 
     def index
       @unpublished_pages = Page.unpublished.order("updated_at desc")
-      @unpublished_pages = @unpublished_pages.select { |page| current_user.able_to_publish?(page) }
-      @incomplete_tasks = current_user.tasks.incomplete.
+      @unpublished_pages = @unpublished_pages.select { |page| current_cms_user.able_to_publish?(page) }
+      @incomplete_tasks = current_cms_user.tasks.incomplete.
           includes(:page).
           order("#{Task.table_name}.due_date desc, #{Page.table_name}.name").
           references(:page)
diff --git a/app/controllers/cms/links_controller.rb b/app/controllers/cms/links_controller.rb
index ea668b59b..8d5099507 100644
--- a/app/controllers/cms/links_controller.rb
+++ b/app/controllers/cms/links_controller.rb
@@ -64,12 +64,12 @@ def link_params
 
     def load_section
       @section = Section.find(params[:section_id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@section)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@section)
     end
 
     def load_link
       @link = Link.find(params[:id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@link)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@link)
     end
 
     def load_draft_link
diff --git a/app/controllers/cms/pages_controller.rb b/app/controllers/cms/pages_controller.rb
index 375435096..6cffad6e4 100644
--- a/app/controllers/cms/pages_controller.rb
+++ b/app/controllers/cms/pages_controller.rb
@@ -73,7 +73,7 @@ def destroy
       define_method status do
         if params[:page_ids]
           @pages = params[:page_ids].map { |id| Page.find(id) }
-          raise Cms::Errors::AccessDenied unless @pages.all? { |page| current_user.able_to_edit?(page) }
+          raise Cms::Errors::AccessDenied unless @pages.all? { |page| current_cms_user.able_to_edit?(page) }
           @pages.each { |page| page.send(status) }
           flash[:notice] = "#{params[:page_ids].size} pages #{verb}"
           redirect_to dashboard_url
@@ -117,7 +117,7 @@ def page_params
     end
 
     def strip_visibility_params
-      unless current_user.able_to?(:publish_content)
+      unless current_cms_user.able_to?(:publish_content)
         params[:page].delete :hidden
         params[:page].delete :archived
         params[:page].delete :visibility
@@ -126,7 +126,7 @@ def strip_visibility_params
 
     def load_page
       @page = Page.find(params[:id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@page)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@page)
     end
 
     def load_draft_page
@@ -136,7 +136,7 @@ def load_draft_page
 
     def load_section
       @section = Section.find(params[:section_id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@section)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@section)
     end
 
     def hide_toolbar
diff --git a/app/controllers/cms/section_nodes_controller.rb b/app/controllers/cms/section_nodes_controller.rb
index d8135c3bb..e469b8d0a 100644
--- a/app/controllers/cms/section_nodes_controller.rb
+++ b/app/controllers/cms/section_nodes_controller.rb
@@ -4,7 +4,7 @@ class SectionNodesController < Cms::BaseController
     check_permissions :publish_content, :except => [:index]
 
     def index
-      @modifiable_sections = current_user.modifiable_sections
+      @modifiable_sections = current_cms_user.modifiable_sections
       @public_sections = Group.guest.sections.to_a # Load once here so that every section doesn't need to.
 
       @sitemap = Section.sitemap
diff --git a/app/controllers/cms/sections_controller.rb b/app/controllers/cms/sections_controller.rb
index c47d360ba..a743d7242 100644
--- a/app/controllers/cms/sections_controller.rb
+++ b/app/controllers/cms/sections_controller.rb
@@ -27,7 +27,7 @@ def new
     def create
       @section = Cms::Section.new(section_params)
       @section.parent = @parent
-      @section.groups = @section.parent.groups unless current_user.able_to?(:administrate)
+      @section.groups = @section.parent.groups unless current_cms_user.able_to?(:administrate)
       if @section.save
         flash[:notice] = "Section '#{@section.name}' was created"
         redirect_to @section
@@ -40,7 +40,7 @@ def edit
     end
 
     def update
-      params[:section].delete('group_ids') if params[:section] && !current_user.able_to?(:administrate)
+      params[:section].delete('group_ids') if params[:section] && !current_cms_user.able_to?(:administrate)
       @section.attributes = section_params()
       if @section.save
         flash[:notice] = "Section '#{@section.name}' was updated"
@@ -80,12 +80,12 @@ def section_params
 
     def load_parent
       @parent = Cms::Section.find(params[:section_id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@parent)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@parent)
     end
 
     def load_section
       @section = Cms::Section.find(params[:id])
-      raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@section)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to_edit?(@section)
     end
 
     def public_groups
diff --git a/app/controllers/cms/tasks_controller.rb b/app/controllers/cms/tasks_controller.rb
index ae41a922f..c593a195f 100644
--- a/app/controllers/cms/tasks_controller.rb
+++ b/app/controllers/cms/tasks_controller.rb
@@ -4,12 +4,12 @@ class TasksController < Cms::BaseController
     before_filter :load_page, :only => [:new, :create]
 
     def new
-      @task = @page.tasks.build(:assigned_by => current_user)
+      @task = @page.tasks.build(:assigned_by => current_cms_user)
     end
 
     def create
       @task = @page.tasks.build(task_params())
-      @task.assigned_by = current_user
+      @task.assigned_by = current_cms_user
       if @task.save
         flash[:notice] = "Page was assigned to '#{@task.assigned_to.login}'"
         redirect_to @page.path
@@ -21,7 +21,7 @@ def create
     def complete
       if params[:task_ids]
         Task.where(["id in (?)", params[:task_ids]]).each do |t|
-          if t.assigned_to == current_user
+          if t.assigned_to == current_cms_user
             t.mark_as_complete!
           end
         end
@@ -29,7 +29,7 @@ def complete
         redirect_to dashboard_path
       else
         @task = Task.find(params[:id])
-        if @task.assigned_to == current_user
+        if @task.assigned_to == current_cms_user
           if @task.mark_as_complete!
             flash[:notice] = "Task was marked as complete"
           end
diff --git a/app/controllers/cms/user_controller.rb b/app/controllers/cms/user_controller.rb
index aa8f85f8a..4754470b9 100644
--- a/app/controllers/cms/user_controller.rb
+++ b/app/controllers/cms/user_controller.rb
@@ -2,7 +2,7 @@ module Cms
   class UserController < Cms::ApplicationController
     # Return information about the current user as json. Can be used by cached html pages do create interactive elements.
     def show
-      render json: Cms::UserPresenter.new(current_user)
+      render json: Cms::UserPresenter.new(current_cms_user)
     end
   end
 end
diff --git a/app/controllers/cms/users_controller.rb b/app/controllers/cms/users_controller.rb
index 80adee0f3..860906362 100644
--- a/app/controllers/cms/users_controller.rb
+++ b/app/controllers/cms/users_controller.rb
@@ -56,7 +56,7 @@ def change_password
     def update_password
       if user.update(cms_user_params)
         flash[:notice] = "Password for '#{user.login}' was changed"
-        redirect_to(current_user.able_to?(:administrate) ? users_path : "/")
+        redirect_to(current_cms_user.able_to?(:administrate) ? users_path : "/")
       else
         render :action => 'change_password'
       end
@@ -119,7 +119,7 @@ def set_menu_section
     end
 
     def only_self_or_administrator
-      raise Cms::Errors::AccessDenied if !current_user.able_to?(:administrate) && params[:id].to_i != current_user.id
+      raise Cms::Errors::AccessDenied if !current_cms_user.able_to?(:administrate) && params[:id].to_i != current_cms_user.id
     end
   end
 end
\ No newline at end of file
diff --git a/app/helpers/cms/content_block_helper.rb b/app/helpers/cms/content_block_helper.rb
index 84c0c26e5..c08b9dfcb 100644
--- a/app/helpers/cms/content_block_helper.rb
+++ b/app/helpers/cms/content_block_helper.rb
@@ -10,15 +10,15 @@ module ContentBlockHelper
     # * If the user can edit/publish it
     def block_row_tag(block)
       cname = class_name_for(block)
-      can_modify = current_user.able_to_modify?(block)
+      can_modify = current_cms_user.able_to_modify?(block)
 
       options = {
           :id => "#{cname}_#{block.id}",
           :class => cname
       }
       options[:class] += block.class.publishable? && !block.published? ? ' draft' : ' published'
-      options[:class] += ' non-editable' unless can_modify && current_user.able_to?(:edit_content)
-      options[:class] += ' non-publishable' unless can_modify && current_user.able_to?(:publish_content)
+      options[:class] += ' non-editable' unless can_modify && current_cms_user.able_to?(:edit_content)
+      options[:class] += ' non-publishable' unless can_modify && current_cms_user.able_to?(:publish_content)
       tag "tr", options, true
     end
 
@@ -28,7 +28,7 @@ def block_row_tag(block)
     # We use 'data-' elements here to avoid duplication of path calculations.
     def content_block_tr_tag(block)
       cname = class_name_for(block)
-      can_modify = current_user.able_to_modify?(block)
+      can_modify = current_cms_user.able_to_modify?(block)
 
       options = {}
       data = options[:data] = {}
@@ -36,8 +36,8 @@ def content_block_tr_tag(block)
 
       options[:id] = "#{cname}_#{block.id}"
       options[:class] = [cname]
-      options[:class] << 'non-editable' unless can_modify && current_user.able_to?(:edit_content)
-      options[:class] << 'non-publishable' unless can_modify && current_user.able_to?(:publish_content)
+      options[:class] << 'non-editable' unless can_modify && current_cms_user.able_to?(:edit_content)
+      options[:class] << 'non-publishable' unless can_modify && current_cms_user.able_to?(:publish_content)
       options['data-new_path'] = url_for(new_engine_aware_path(block))
       options['data-view_path'] = url_for(engine_aware_path(block, nil))
       options['data-edit_path'] = url_for(edit_engine_aware_path(block))
diff --git a/app/helpers/cms/page_helper.rb b/app/helpers/cms/page_helper.rb
index bcd7edd7c..ba724b51d 100644
--- a/app/helpers/cms/page_helper.rb
+++ b/app/helpers/cms/page_helper.rb
@@ -157,7 +157,7 @@ def render_portlet(name)
 
     # Determines if the current_user is able to do specific permissions.
     def able_to?(*perms, &block)
-      block.call if current_user.able_to?(*perms)
+      block.call if current_cms_user.able_to?(*perms)
       return ''
     end
 
diff --git a/app/helpers/cms/path_helper.rb b/app/helpers/cms/path_helper.rb
index 3ef192b25..0622e307f 100644
--- a/app/helpers/cms/path_helper.rb
+++ b/app/helpers/cms/path_helper.rb
@@ -18,7 +18,7 @@ def link_to_addressable_content(name, content)
     # Content editors will see exact specific version path, while other users will see the 'public' url for the path.
     def attachment_path_for(attachment)
       return "" unless attachment
-      if current_user.able_to?(:edit_content)
+      if current_cms_user.able_to?(:edit_content)
         attachment.attachment_version_path
       else
         attachment.url
diff --git a/app/helpers/cms/rendering_helper.rb b/app/helpers/cms/rendering_helper.rb
index 24ee21f07..525555138 100644
--- a/app/helpers/cms/rendering_helper.rb
+++ b/app/helpers/cms/rendering_helper.rb
@@ -55,7 +55,7 @@ def attachment_viewer(content)
 
     # Determines if the current user can edit and is currently editing this content.
     def is_current_user_able_to_edit_this_content?(content)
-      content && logged_in? && edit_mode? && current_user.able_to_edit?(content)
+      content && logged_in? && edit_mode? && current_cms_user.able_to_edit?(content)
     end
 
     # @deprecated
diff --git a/app/helpers/cms/ui_elements_helper.rb b/app/helpers/cms/ui_elements_helper.rb
index 0f99ba19e..703ce93cd 100644
--- a/app/helpers/cms/ui_elements_helper.rb
+++ b/app/helpers/cms/ui_elements_helper.rb
@@ -32,7 +32,7 @@ def bottom_buttons(form, partial_name="buttons")
     # 1. Current User has publish rights
     # 2. Block is publishable
     def save_and_publish_button(block, content_type)
-      if current_user.able_to?(:publish_content) && block.publishable?
+      if current_cms_user.able_to?(:publish_content) && block.publishable?
         html = %Q{<button type="submit" name="#{content_type.content_block_type.singularize}[publish_on_save]" value="true" class="submit btn btn-primary" tabindex="#{next_tabindex}"><span>Save And Publish</span></button>}
         html.html_safe
       end
@@ -50,7 +50,7 @@ def publish_button(type)
     def publish_menu_button(content_item)
       options = {class: ["btn", "btn-primary", "http_put"], id: "publish_button"}
       path = "#"
-      if current_user.able_to?(:publish_content) && !content_item.new_record? && content_item.respond_to?(:live?) && !content_item.live?
+      if current_cms_user.able_to?(:publish_content) && !content_item.new_record? && content_item.respond_to?(:live?) && !content_item.live?
         path = engine(@block).polymorphic_path([:publish, @block])
       else
         options[:class] << "disabled"
@@ -118,7 +118,7 @@ def versions_menu_button(content_item)
     #
     def delete_menu_button(content_item=nil, opts={class: []})
       classes = ["btn", "http_delete", "confirm_with_title"]
-      if current_user.able_to_publish?(content_item)
+      if current_cms_user.able_to_publish?(content_item)
         classes << 'btn-primary'
       else
         classes << 'disabled'
diff --git a/app/inputs/attachments_input.rb b/app/inputs/attachments_input.rb
index 61499e392..ee121b327 100644
--- a/app/inputs/attachments_input.rb
+++ b/app/inputs/attachments_input.rb
@@ -1,6 +1,6 @@
 class AttachmentsInput < SimpleForm::Inputs::Base
 
-  def input
+  def input(wrapper_options = nil)
     definitions = Cms::Attachment.definitions_for(object.class.name, :multiple)
     if definitions.empty?
       template.render(partial: 'cms/attachments/no_attachments_defined', locals: {object: object})
@@ -11,4 +11,4 @@ def input
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/inputs/cms_text_area_input.rb b/app/inputs/cms_text_area_input.rb
index 0157bf4d7..f0ef80921 100644
--- a/app/inputs/cms_text_area_input.rb
+++ b/app/inputs/cms_text_area_input.rb
@@ -3,8 +3,8 @@
 class CmsTextAreaInput < SimpleForm::Inputs::TextInput
 
   include Cms::FormBuilder::DefaultInput
-  def input
+  def input(wrapper_options = nil)
     extract_default
     @builder.text_area(attribute_name, input_html_options).html_safe
   end
-end
\ No newline at end of file
+end
diff --git a/app/inputs/date_picker_input.rb b/app/inputs/date_picker_input.rb
index db6a59730..fdee10473 100644
--- a/app/inputs/date_picker_input.rb
+++ b/app/inputs/date_picker_input.rb
@@ -2,7 +2,7 @@
 #   1. Allows for empty dates (i.e. no date)
 class DatePickerInput < SimpleForm::Inputs::TextInput
 
-  def input
+  def input(wrapper_options = nil)
     @builder.text_field(attribute_name, input_html_options).html_safe
   end
-end
\ No newline at end of file
+end
diff --git a/app/inputs/file_picker_input.rb b/app/inputs/file_picker_input.rb
index cd1a91ff6..6661d56e1 100644
--- a/app/inputs/file_picker_input.rb
+++ b/app/inputs/file_picker_input.rb
@@ -6,7 +6,7 @@
 # @option options [String] :hint (blank) Helpful tips for the person entering the field, appears blank if nothing is specified.
 class FilePickerInput < SimpleForm::Inputs::Base
 
-  def input
+  def input(wrapper_options = nil)
     # New blocks will not have their attachments created yet.
     object.ensure_attachment_exists if object.respond_to?(:ensure_attachment_exists)
 
@@ -72,4 +72,4 @@ def sections_with_full_paths
     sections
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/inputs/name_input.rb b/app/inputs/name_input.rb
index 73bf5da1a..2444b04de 100644
--- a/app/inputs/name_input.rb
+++ b/app/inputs/name_input.rb
@@ -14,7 +14,7 @@ def initialize(*args)
     options[:placeholder] = "Name" if options[:placeholder].nil?
   end
 
-  def input
+  def input(wrapper_options = nil)
     add_slug_source_for_content_that_needs_it
 
     unless options[:label]
@@ -39,4 +39,4 @@ def should_autogenerate_slug?
   def content_requires_slug_field?
     object.class.requires_slug?
   end
-end
\ No newline at end of file
+end
diff --git a/app/inputs/path_input.rb b/app/inputs/path_input.rb
index 3e98937d1..ca12f5fc8 100644
--- a/app/inputs/path_input.rb
+++ b/app/inputs/path_input.rb
@@ -1,6 +1,6 @@
 class PathInput < SimpleForm::Inputs::TextInput
 
-  def input
+  def input(wrapper_options = nil)
     if forecasting_a_new_section?
       options[:hint] = "Forecast: Saving this first #{object.class.display_name} will create a new section at #{object.class.path}."
     end
@@ -15,4 +15,4 @@ def forecasting_a_new_section?
     Cms::Section.with_path(object.class.path).first.nil?
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/inputs/template_editor_input.rb b/app/inputs/template_editor_input.rb
index 55e7959c1..bf34c3166 100644
--- a/app/inputs/template_editor_input.rb
+++ b/app/inputs/template_editor_input.rb
@@ -2,11 +2,11 @@ class TemplateEditorInput < SimpleForm::Inputs::TextInput
 
   include Cms::FormBuilder::DefaultInput
 
-  def label
+  def label(wrapper_options = nil)
     super if render_template_input?
   end
 
-  def input
+  def input(wrapper_options = nil)
     if render_template_input?
       options[:default] = object.class.default_template
       options[:default_handler] = "erb" unless options[:default_handler]
@@ -21,4 +21,4 @@ def input
   def render_template_input?
     object.class.render_inline
   end
-end
\ No newline at end of file
+end
diff --git a/app/inputs/text_editor_input.rb b/app/inputs/text_editor_input.rb
index b72bf26de..35e992cf6 100644
--- a/app/inputs/text_editor_input.rb
+++ b/app/inputs/text_editor_input.rb
@@ -1,13 +1,15 @@
 class TextEditorInput < SimpleForm::Inputs::TextInput
 
-  def input
+  def input(wrapper_options = nil)
     tag_id = "#{object_name}_#{attribute_name}"
+    path = input_html_options.fetch(:data, {})[:path]
     s = template.select_tag(:dhtml_selector,
-                                  template.options_for_select([["Rich Text", ""],["Simple Text", "disabled"]],
-                                  template.cookies[:editorEnabled] == 'true' ? "" : "disabled"),
-                                  :class => "#{object_name}_#{attribute_name}_dhtml_selector",
-                                  :tabindex => '-1',
-                                  :onchange => "toggleEditor('#{tag_id}', this)".html_safe)
+                            template.options_for_select([["Rich Text", ""],["Simple Text", "disabled"]],
+                                                        template.cookies["editorEnabled_#{tag_id}_#{path}"] == 'true' ? "" : "disabled"),
+                            :class => "#{object_name}_#{attribute_name}_dhtml_selector",
+                            :tabindex => '-1',
+                            :onchange => "toggleEditor('#{tag_id}', this)".html_safe,
+                            :data => input_html_options[:data])
     s += template.content_tag(:div, super, class: 'editor')
 
   end
@@ -16,4 +18,4 @@ def input
   def input_html_classes
     super.push('editor')
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/cms/attachment.rb b/app/models/cms/attachment.rb
index 6c6d38acf..6f5fc1a47 100644
--- a/app/models/cms/attachment.rb
+++ b/app/models/cms/attachment.rb
@@ -62,10 +62,10 @@ def configuration
       # Paperclip can handle a :styles parameter which responds to :call(Paperclip::Attachment)
       def dynamically_return_styles
         lambda do |paperclip_attachment|
-          cms_attachment = paperclip_attachment.instance
+          cms_attachment = paperclip_attachment.try(:instance)
 
           # Look up the style for the given block
-          if cms_attachment.has_assigned_content_type?
+          if cms_attachment && cms_attachment.has_assigned_content_type?
             configuration_value(cms_attachment.content_block_class, cms_attachment.attachment_name, :styles)
           else # New attachments that aren't associated with an Attaching type yet have no styles
             {}
@@ -100,7 +100,7 @@ def configure_paperclip
                           :bucket => rail_config(:s3_bucket),
                           :s3_host_name => rail_config(:s3_host_name),
                           :s3_host_alias => rail_config(:s3_host_alias)
-
+        do_not_validate_attachment_file_type :data
       end
 
       # Looks up a value from Rails config
diff --git a/app/models/cms/email_message.rb b/app/models/cms/email_message.rb
index 5b909af7b..ea7001a2f 100644
--- a/app/models/cms/email_message.rb
+++ b/app/models/cms/email_message.rb
@@ -31,8 +31,8 @@ def self.normalize_domain(domain)
     # @param [String] path A relative path (i.e. /cms/your-page)
     # @return [String] (i.e http://cms.example.com/cms/your-page)
     def self.absolute_cms_url(path)
-      host = normalize_domain(Rails.configuration.cms.site_domain)
-      "http://#{cms_domain_prefix}.#{host}#{path}"
+      host = [cms_domain_prefix, normalize_domain(Rails.configuration.cms.site_domain)].compact.join(".")
+      "http://#{host}#{path}"
     end
 
     # Returns a default address that mail will be sent from. (i.e. mailbot@example.com)
@@ -60,4 +60,4 @@ def deliver!
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/cms/guest_user.rb b/app/models/cms/guest_user.rb
index 1ef1d8d2e..eca8141e1 100644
--- a/app/models/cms/guest_user.rb
+++ b/app/models/cms/guest_user.rb
@@ -13,7 +13,7 @@ def initialize(attributes={})
     end
 
     def able_to?(*name)
-      group && group.permissions.count(:conditions => ["name in (?)", name.map(&:to_s)]) > 0
+      group && group.permissions.where(name: name.map(&:to_s)).exists?
     end
 
     # Guests never get access to the CMS.
diff --git a/app/models/cms/page.rb b/app/models/cms/page.rb
index bfb7cf085..c0f42cf81 100644
--- a/app/models/cms/page.rb
+++ b/app/models/cms/page.rb
@@ -204,6 +204,11 @@ def copy_connectors(options={})
     true
   end
 
+  def main_attributes
+    draft.attributes.slice("description", "archived", "cacheable", "hidden", "keywords", "language", "name",
+                           "template_file_name", "title")
+  end
+
   # Adds a Content block to this page.
   #
   # @param [ContentBlock] connectable The content block to be added
@@ -216,9 +221,9 @@ def add_content(connectable, container=:main)
       #              connectable.connected_page &&
       #              (connectable.class.publishable? ? connectable.published? : true)
       should_publish = false
-      update_attributes(
+      update_attributes({
           :version_comment => "#{connectable} was added to the '#{container}' container",
-          :publish_on_save => should_publish
+          :publish_on_save => should_publish }.merge(main_attributes)
       )
       connectors.create(
           :page_version => draft.version,
@@ -237,7 +242,7 @@ def move_connector(connector, direction)
       raise "Connector is nil" unless connector
       raise "Direction is nil" unless direction
       orientation = direction[/_/] ? "#{direction.sub('_', ' the ')} of" : "#{direction} within"
-      update_attributes(:version_comment => "#{connector.connectable} was moved #{orientation} the '#{connector.container}' container", :publish_on_save => false)
+      update_attributes({:version_comment => "#{connector.connectable} was moved #{orientation} the '#{connector.container}' container", :publish_on_save => false}.merge(main_attributes))
       connectors.for_page_version(draft.version).like(connector).first.send("move_#{direction}")
     end
   end
@@ -251,7 +256,7 @@ def move_connector(connector, direction)
   def remove_connector(connector)
     transaction do
       raise "Connector is nil" unless connector
-      update_attributes(version_comment: "#{connector.connectable} was removed from the '#{connector.container}' container", publish_on_save: false)
+      update_attributes({version_comment: "#{connector.connectable} was removed from the '#{connector.container}' container", publish_on_save: false}.merge(main_attributes))
 
       #The logic of this is to go ahead and let the container get copied forward, then delete the new connector
       if new_connector = connectors.for_page_version(draft.version).like(connector).first
diff --git a/app/models/cms/portlet.rb b/app/models/cms/portlet.rb
index 03057599c..201a99487 100644
--- a/app/models/cms/portlet.rb
+++ b/app/models/cms/portlet.rb
@@ -25,7 +25,7 @@ def self.description(description="")
 
     delegate :request, :response, :session,
              :flash, :params, :cookies,
-             :current_user, :logged_in?,
+             :current_cms_user, :logged_in?,
              :to => :controller
 
     def self.inherited(subclass)
diff --git a/app/views/cms/content_block/render_block_in_main_container.html.erb b/app/views/cms/content_block/render_block_in_main_container.html.erb
index b6963a8d0..4330829ea 100644
--- a/app/views/cms/content_block/render_block_in_main_container.html.erb
+++ b/app/views/cms/content_block/render_block_in_main_container.html.erb
@@ -1,4 +1,4 @@
-<% if current_user.able_to_edit?(@block) %>
+<% if current_cms_user.able_to_edit?(@block) %>
     <% content_for :html_head do %>
         <%= javascript_include_tag 'cms/page_editor' %>
         <%= stylesheet_link_tag 'cms/page_content_editing' %>
diff --git a/app/views/cms/pages/_form.html.erb b/app/views/cms/pages/_form.html.erb
index 194edc09e..66a4e7b48 100644
--- a/app/views/cms/pages/_form.html.erb
+++ b/app/views/cms/pages/_form.html.erb
@@ -6,7 +6,7 @@
         <% content_for :sidebar do %>
             <div class="sidebar-block">
               <h4 class="gray">Status &nbsp; <%= draft_icon_tag(@block, force: true) %></h4>
-              <% if current_user.able_to?(:publish_content) %>
+              <% if current_cms_user.able_to?(:publish_content) %>
                   <h4 class="gray label">Visibility</h4>
                   <%= f.input :visibility, label: false, collection: @page.visibilities, prompt: false, input_html: {class: 'input-block-level'} %>
               <% end %>
diff --git a/app/views/layouts/cms/_main_menu.html.erb b/app/views/layouts/cms/_main_menu.html.erb
index 25b171f2a..ab8371dd3 100644
--- a/app/views/layouts/cms/_main_menu.html.erb
+++ b/app/views/layouts/cms/_main_menu.html.erb
@@ -1,10 +1,10 @@
 <div class="logged-in">
   <div class="container center-column">
     <ul class="subnav right">
-      <li><%= link_to current_user.full_name, cms.edit_user_path(current_user) unless current_user.guest? %></li>
-      <li><%= link_to "Settings", "#" unless current_user.guest? %></li>
+      <li><%= link_to current_cms_user.full_name, cms.edit_user_path(current_cms_user) unless current_cms_user.guest? %></li>
+      <li><%= link_to "Settings", "#" unless current_cms_user.guest? %></li>
       <li><%= link_to "Help", 'https://github.com/browsermedia/browsercms/wiki', target: '_blank' %></li>
-      <li><%= link_to "Logout", cms.logout_path unless current_user.guest? %></li>
+      <li><%= link_to "Logout", cms.logout_path unless current_cms_user.guest? %></li>
     </ul>
   </div>
 </div>
@@ -13,7 +13,7 @@
   <div class="container center-column">
     <%= link_to image_tag('cms/logo.png', class: 'main-logo'), "/" %>
     <ul class="mainnav">
-      <% if current_user.able_to?(:edit_content) %>
+      <% if current_cms_user.able_to?(:edit_content) %>
       <li>
         <%= link_to "Dashboard", cms.dashboard_path %>
         <ul class="dropdown-menu">
@@ -33,7 +33,7 @@
         <%= render partial: 'layouts/cms/content_types', locals: { library: true, id: 'content-library-menu' } %>
       </li>
       <% end %>
-      <% if current_user.able_to? :administrate %>
+      <% if current_cms_user.able_to? :administrate %>
       <li>
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin<b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -55,7 +55,7 @@
       <% end %>
     </ul>
 
-    <% if current_user.able_to?(:edit_content) %>
+    <% if current_cms_user.able_to?(:edit_content) %>
     <div class="btn-group">
       <%= menu_button "New", new_button_path, id: 'new-content-button', class: 'btn btn-primary', tabindex: '-1' %>
       <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" tabindex="-1">
diff --git a/app/views/layouts/cms/page_editor.html.erb b/app/views/layouts/cms/page_editor.html.erb
index 41dd25032..9f03f7975 100644
--- a/app/views/layouts/cms/page_editor.html.erb
+++ b/app/views/layouts/cms/page_editor.html.erb
@@ -24,7 +24,7 @@
                 class: "right btn btn-small btn-primary primary-cta http_put",
                 :id => "publish_button",
                 :target => "_top",
-                :enabled => !(!current_user.able_to?(:publish_content) || !current_user.able_to_edit?(@page) || @page.version != @page.draft.version || @page.live?)
+                :enabled => !(!current_cms_user.able_to?(:publish_content) || !current_cms_user.able_to_edit?(@page) || @page.version != @page.draft.version || @page.live?)
     %>
 
     <div class="btn-group">
@@ -36,7 +36,7 @@
                           :target => "_top",
                           :align => 'none',
                           class: 'btn btn-small',
-                          :enabled => !(@page.assigned_to == current_user || !current_user.able_to_edit?(@page))
+                          :enabled => !(@page.assigned_to == current_cms_user || !current_cms_user.able_to_edit?(@page))
               %>
           <% else %>
               <%= link_to "Complete Task",
@@ -44,14 +44,14 @@
                           :id => "complete_task_button",
                           class: 'http_put btn btn-small',
                           :target => "_top",
-                          :enabled => !(@page.assigned_to != current_user || !current_user.able_to_edit?(@page)) %>
+                          :enabled => !(@page.assigned_to != current_cms_user || !current_cms_user.able_to_edit?(@page)) %>
           <% end %>
       <% end %>
       <%= link_to "Versions",
                   engine(@page).polymorphic_path([:versions, @page]),
                   :target => "_top",
                   class: "btn btn-small",
-                  :enabled => current_user.able_to_edit?(@page)
+                  :enabled => current_cms_user.able_to_edit?(@page)
       %>
     </div>
 
@@ -62,7 +62,7 @@
                       :id => "delete_button",
                       title: "Are you sure you want to delete '#{@page.name}'?",
                       :target => "_top",
-                      :enabled => current_user.able_to_publish?(@page),
+                      :enabled => current_cms_user.able_to_publish?(@page),
                       class: 'btn btn-small btn-danger http_delete confirm_with_title' %>
       <% end %>
     </div>
@@ -74,7 +74,7 @@
                   class: "btn btn-small",
                   :id => "edit_properties_button",
                   :target => "_top",
-                  :enabled => current_user.able_to_edit?(@page)
+                  :enabled => current_cms_user.able_to_edit?(@page)
       %>
       <%= link_to "Preview", preview_content_path(@page), id: "preview_button", class: 'btn btn-small', target: "_blank" if @page.class.addressable?  %>
 
diff --git a/browsercms.gemspec b/browsercms.gemspec
index 2c0d6dc06..3a1c90bf7 100644
--- a/browsercms.gemspec
+++ b/browsercms.gemspec
@@ -34,13 +34,13 @@ Gem::Specification.new do |s|
   s.add_dependency("devise", "~> 3.0")
   s.add_dependency("sass-rails")
   s.add_dependency("bootstrap-sass")
-  s.add_dependency("compass-rails", "~> 1.1.3")
+  s.add_dependency("compass-rails", "~> 2.0.4")
   s.add_dependency("ancestry", "~> 2.0.0")
   s.add_dependency("ckeditor_rails", "~> 4.3.0")
   s.add_dependency("underscore-rails", "~> 1.4")
   s.add_dependency("jquery-rails", "~> 3.1")
   s.add_dependency("jquery-ui-rails", "~> 4.1")
-  s.add_dependency("paperclip", "~> 3.4")
+  s.add_dependency("paperclip", "~> 4.3")
   s.add_dependency("panoramic")
   s.add_dependency("will_paginate", "~>3.0.0")
   s.add_dependency("actionpack-page_caching", "~>1.0")
diff --git a/config/routes.rb b/config/routes.rb
index ca9710056..790f8c371 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,7 +15,8 @@
              path: :users,
              class_name: 'Cms::PersistentUser',
              controllers: {passwords: 'cms/passwords'},
-             module: :devise
+             module: :devise,
+             router_name: :cms
 
   devise_scope :cms_user do
     get '/login' => "sessions#new", :as => 'login'
diff --git a/features/step_definitions/image_steps.rb b/features/step_definitions/image_steps.rb
index eaa8c74ed..b2e03fda9 100644
--- a/features/step_definitions/image_steps.rb
+++ b/features/step_definitions/image_steps.rb
@@ -109,7 +109,9 @@
 
 Given /^a file exists with two versions$/ do
   @original_file_name = "File Version 1"
-  @file = create(:file_block, :name => @original_file_name, :attachment_file => mock_file(:original_filename => 'version1.txt'))
+  @file = create(:file_block,
+                 :name => @original_file_name,
+                 :attachment_file => mock_file(:original_filename => 'version1.txt', :content_type => 'text/plain'))
 
   visit "/cms/file_blocks/#{@file.id}/edit"
   attach_file "File", "test/fixtures/multipart/version2.txt"
@@ -150,4 +152,4 @@
 Then /^I should see the latest version of the image$/ do
   get_image("img[data-type=image_block]")
   assert_equal @image.file.data_file_path, current_path, "Should not be the login screen."
-end
\ No newline at end of file
+end
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index 8af2b88a2..cdb51866c 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -81,11 +81,11 @@
 end
 
 Given /^I have a content editor account$/ do
-  self.current_user = create(:content_editor)
+  self.current_cms_user = create(:content_editor)
 end
 
 When /^I am logged in$/ do
-  login_as(current_user.login, current_user.password)
+  login_as(current_cms_user.login, current_cms_user.password)
 end
 
 When /^there is another user$/ do
@@ -93,7 +93,7 @@
 end
 
 When /^I change my password$/ do
-  visit cms.change_password_user_path(current_user)
+  visit cms.change_password_user_path(current_cms_user)
   fill_in_password(acceptable_password)
   click_save_button
 end
@@ -159,7 +159,7 @@
 end
 
 When /^I login to the public site$/ do
-  login_as(current_user.login, current_user.password, "/login")
+  login_as(current_cms_user.login, current_cms_user.password, "/login")
 end
 
 When(/^I login in as an external user (?:again|for the first time)$/) do
@@ -250,4 +250,4 @@ def cmsadmin
 Then /^I should be able to log in with the new password$/ do
   login_as(Cms::User.first.login, @new_password)
   should_be_successful
-end
\ No newline at end of file
+end
diff --git a/features/support/cms_api.rb b/features/support/cms_api.rb
index dd7561e7d..81c58c861 100644
--- a/features/support/cms_api.rb
+++ b/features/support/cms_api.rb
@@ -1,7 +1,7 @@
 module Cms
   module WebApi
 
-    attr_accessor :current_user
+    attr_accessor :current_cms_user
 
     # Log in to the CMS admin.
     def login_as(username, password, path=cms.login_path)
diff --git a/features/support/file_operations.rb b/features/support/file_operations.rb
index 6cfa7c3b0..824c8ad2e 100644
--- a/features/support/file_operations.rb
+++ b/features/support/file_operations.rb
@@ -17,7 +17,8 @@ def create_file(relative_file_path, text="Test Content", section=nil)
 
   def text_file(relative_file_path, text)
     file_name = relative_file_path.gsub(/^\//, "")
-    tempfile = Tempfile.new file_name
+    extension = file_name.split(".").last
+    tempfile = Tempfile.new([file_name, ".#{extension}"])
     tempfile << text
     tempfile.flush
     tempfile.close
diff --git a/lib/cms/acts/content_page.rb b/lib/cms/acts/content_page.rb
index 800011e31..584a2cc49 100644
--- a/lib/cms/acts/content_page.rb
+++ b/lib/cms/acts/content_page.rb
@@ -51,7 +51,7 @@ def page_title=(title)
 
       # Before filter that determines if the current user can access a specific section.
       def check_access_to_section
-        user = current_user
+        user = current_cms_user
         logger.warn "Checking that current_user '#{user.login}' has access to view section with path '#{self.class.in_section}'."
         unless user.able_to_view?(self.class.in_section)
           store_location
diff --git a/lib/cms/attachments/attachment_serving.rb b/lib/cms/attachments/attachment_serving.rb
index 27009465b..82f1b2e72 100644
--- a/lib/cms/attachments/attachment_serving.rb
+++ b/lib/cms/attachments/attachment_serving.rb
@@ -13,7 +13,7 @@ module Serving
       #   storage = :filesystem -> Cms::Attachments::FilesystemStrategy
       def send_attachment(attachment)
         if attachment
-          raise Cms::Errors::AccessDenied unless current_user.able_to_view?(attachment)
+          raise Cms::Errors::AccessDenied unless current_cms_user.able_to_view?(attachment)
           strategy_class = send_attachments_with
           strategy_class.send_attachment(attachment, self)
         end
diff --git a/lib/cms/authentication/controller.rb b/lib/cms/authentication/controller.rb
index 0b7749cc3..a38b92d9b 100644
--- a/lib/cms/authentication/controller.rb
+++ b/lib/cms/authentication/controller.rb
@@ -23,7 +23,7 @@ module Controller
       # Inclusion hook to make #current_user and #logged_in?
       # available as ActionView helper methods.
       def self.included(base)
-        base.send :helper_method, :current_user, :logged_in? if base.respond_to? :helper_method
+        base.send :helper_method, :logged_in? if base.respond_to? :helper_method
         base.extend ClassMethods
       end
 
@@ -43,7 +43,7 @@ module ClassMethods
         def check_permissions(*perms)
           opts = Hash === perms.last ? perms.pop : {}
           before_filter(opts) do |controller|
-            raise Cms::Errors::AccessDenied unless controller.send(:current_user).able_to?(*perms)
+            raise Cms::Errors::AccessDenied unless controller.send(:current_cms_user).able_to?(*perms)
           end
         end
       end
@@ -52,15 +52,13 @@ def check_permissions(*perms)
       # Returns true or false if the user is logged in.
       # Preloads Cms::User.current with the user model if they're logged in.
       def logged_in?
-        !current_user.nil? && !current_user.guest?
+        !current_cms_user.nil? && !current_cms_user.guest?
       end
 
       # Returns the current user if logged in. If no user is logged in, returns the 'Guest' user which represents a
       # what a visitor can do without being logged in.
-      def current_user
-        @current_user ||= begin
-          Cms::PersistentUser.current = current_cms_user || Cms::User.guest
-        end
+      def current_cms_user
+        @current_cms_user ||= Cms::PersistentUser.current = warden.authenticate(scope: :cms_user) || Cms::User.guest
       end
 
       # Redirect as appropriate when an access request fails.
diff --git a/lib/cms/content_rendering_support.rb b/lib/cms/content_rendering_support.rb
index d9bbce838..4cdc8c5a2 100644
--- a/lib/cms/content_rendering_support.rb
+++ b/lib/cms/content_rendering_support.rb
@@ -33,7 +33,7 @@ def handle_not_found_on_page(exception)
     end
 
     def handle_access_denied_on_page(exception)
-      logger.warn "Access denied for user '#{current_user.login}': Returning the 403 page."
+      logger.warn "Access denied for user '#{current_cms_user.login}': Returning the 403 page."
       handle_error_with_cms_page(Cms::ErrorPages::FORBIDDEN_PATH, exception, :forbidden)
     end
 
@@ -52,7 +52,7 @@ def handle_error_with_cms_page(error_page_path, exception, status, options={})
       if perform_caching
         return handle_server_error(exception, status) if cms_site?
       else
-        return handle_server_error(exception, status) if current_user.able_to?(:edit_content, :publish_content)
+        return handle_server_error(exception, status) if current_cms_user.able_to?(:edit_content, :publish_content)
       end
 
       # We must be showing the page outside of the CMS
@@ -89,7 +89,7 @@ def prepare_connectables_for_render
       @_connectors = @page.current_connectors
       @_connectables = @page.contents
 
-      unless (logged_in? && current_user.able_to?(:administrate, :edit_content, :publish_content))
+      unless (logged_in? && current_cms_user.able_to?(:administrate, :edit_content, :publish_content))
         worst_exception = nil
         @_connectables.each do |c|
           begin
@@ -111,4 +111,4 @@ def prepare_connectables_for_render
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/cms/controllers/admin_controller.rb b/lib/cms/controllers/admin_controller.rb
index 6e5f256c9..0ae2dbb43 100644
--- a/lib/cms/controllers/admin_controller.rb
+++ b/lib/cms/controllers/admin_controller.rb
@@ -51,7 +51,7 @@ def append_to_query_string(url, *params)
     end
 
     def cms_access_required
-      raise Cms::Errors::AccessDenied unless current_user.able_to?(:administrate, :edit_content, :publish_content)
+      raise Cms::Errors::AccessDenied unless current_cms_user.able_to?(:administrate, :edit_content, :publish_content)
     end
 
     def url_with_cms_domain_prefix
@@ -68,8 +68,8 @@ def url_without_cms_domain_prefix
       request.url.sub(/#{cms_domain_prefix}\./, '')
     end
 
-    def ensure_current_user_can_view(content)
-      unless current_user.able_to_view?(content)
+    def ensure_current_cms_user_can_view(content)
+      unless current_cms_user.able_to_view?(content)
         store_location
         raise Cms::Errors::AccessDenied
       end
diff --git a/lib/cms/domain_support.rb b/lib/cms/domain_support.rb
index 75ace03a0..5a270cdfa 100644
--- a/lib/cms/domain_support.rb
+++ b/lib/cms/domain_support.rb
@@ -8,7 +8,7 @@ module DomainSupport
     protected
 
     def cms_domain_prefix
-      "cms"
+      "cms" if wants_to_use_subdomains?
     end
 
     def request_is_for_cms_subdomain?
diff --git a/lib/cms/mobile_aware.rb b/lib/cms/mobile_aware.rb
index c94c21d2a..1857dfe72 100644
--- a/lib/cms/mobile_aware.rb
+++ b/lib/cms/mobile_aware.rb
@@ -37,7 +37,7 @@ def respond_as_mobile?
         session[:mobile_mode] = false
       end
 
-      request.subdomain == "m" || (session[:mobile_mode] == true && current_user.able_to?(:edit_content))
+      request.subdomain == "m" || (session[:mobile_mode] == true && current_cms_user.able_to?(:edit_content))
     end
 
     private
diff --git a/lib/cms/route_extensions.rb b/lib/cms/route_extensions.rb
index a913815a2..3453989fd 100644
--- a/lib/cms/route_extensions.rb
+++ b/lib/cms/route_extensions.rb
@@ -44,7 +44,8 @@ def mount_browsercms
                path: '',
                skip: :password,
                path_names: {sign_in: 'login'},
-               controllers: {sessions: 'cms/sites/sessions'}
+               controllers: {sessions: 'cms/sites/sessions'},
+               router_name: :cms
 
     devise_scope :cms_user do
       get '/forgot-password' => "cms/sites/passwords#new", :as => 'forgot_password'
diff --git a/test/dummy/app/views/devise_tests/show.html.erb b/test/dummy/app/views/devise_tests/show.html.erb
index 40578a36e..ea6ab6627 100644
--- a/test/dummy/app/views/devise_tests/show.html.erb
+++ b/test/dummy/app/views/devise_tests/show.html.erb
@@ -1,7 +1,7 @@
 Devise Test <br>
 
 <h3>Old</h3>
-Current User: <%= current_user.inspect %> <br>
+Current User: <%= current_cms_user.inspect %> <br>
 Thread Local: <%= Cms::User.current.inspect %>      <br>
 Logged in? <%= logged_in? %><br>
 
diff --git a/test/factories/attachable_factories.rb b/test/factories/attachable_factories.rb
index aaf995091..8a90af7ff 100644
--- a/test/factories/attachable_factories.rb
+++ b/test/factories/attachable_factories.rb
@@ -55,7 +55,7 @@ class HasThumbnail < ActiveRecord::Base
   factory :has_many_documents, :class => Cms::Attachment do |m|
       m.attachment_name "documents"
       m.attachable_type "HasManyAttachments"
-      m.data { mock_file }
+      m.data { mock_text_file }
       m.parent { find_or_create_root_section }
       m.attachable_version 1
       m.publish_on_save true
diff --git a/test/factories/factories.rb b/test/factories/factories.rb
index ebd3e8958..ecd52e6ba 100644
--- a/test/factories/factories.rb
+++ b/test/factories/factories.rb
@@ -48,7 +48,7 @@
   factory :file_block, :class => Cms::FileBlock do |m|
     ignore do
       parent { find_or_create_root_section }
-      attachment_file { mock_file(:original_filename => 'sample_upload.txt') }
+      attachment_file { mock_file(:original_filename => 'sample_upload.txt', :content_type => 'text/plain') }
       attachment_file_path { name }
     end
     m.sequence(:name) { |n| "TestFileBlock#{n}" }
diff --git a/test/functional/cms/content_block_controller_test.rb b/test/functional/cms/content_block_controller_test.rb
index 56ddeb1d8..b600e1b24 100644
--- a/test/functional/cms/content_block_controller_test.rb
+++ b/test/functional/cms/content_block_controller_test.rb
@@ -12,7 +12,7 @@ def setup
 
     login_as_cms_admin
     @user = Cms::User.first
-    @controller.stubs(:current_user).returns(@user)
+    @controller.stubs(:current_cms_user).returns(@user)
     @controller.stubs(:render)
     @controller.stubs(:model_class).returns(Dummy::SampleBlock)
     @controller.stubs(:set_default_category)
diff --git a/test/unit/behaviors/attaching_test.rb b/test/unit/behaviors/attaching_test.rb
index 890ff008c..7bc248a21 100644
--- a/test/unit/behaviors/attaching_test.rb
+++ b/test/unit/behaviors/attaching_test.rb
@@ -159,7 +159,7 @@ class RenderingStylesTest < ActiveSupport::TestCase
     test "url for thumbnail" do
       attachment = create(:thumbnail_attachment)
       assert_equal "/attachments/#{attachment.id}/foo.jpg", attachment.url
-      assert_equal "/attachments/#{attachment.id}/foo.jpg?style=thumbnail", attachment.url(:thumbnail)
+      assert_equal "/attachments/#{attachment.id}/foo.jpg%3Fstyle=thumbnail", attachment.url(:thumbnail)
     end
   end
 
@@ -310,7 +310,7 @@ def id_partition
     end
 
     def then_use_this_strategy_to_send_attachments(strategy)
-      self.expects(:current_user).returns(stub(:able_to_view? => true))
+      self.expects(:current_cms_user).returns(stub(:able_to_view? => true))
       strategy.expects(:send_attachment).with(@attachment, self)
     end
 
@@ -359,7 +359,7 @@ class AttachableTest < ActiveSupport::TestCase
 
     def setup
       #file is a mock of the object that Rails wraps file uploads in
-      @file = mock_file(:original_filename => "sample_upload.txt")
+      @file = mock_file(:original_filename => "sample_upload.txt", :content_type => "text/plain")
 
       @section = create(:section, :name => "attachables", :parent => root_section)
     end
@@ -488,7 +488,7 @@ def test_updating_the_attachment_file_name
     end
 
     test "update the file" do
-      @file = mock_file(:original_filename => 'version2.txt')
+      @file = mock_file(:original_filename => 'version2.txt', :content_type => 'text/plain')
       @attachable.attachments[0].data = @file
       @attachable.save!
 
@@ -637,7 +637,7 @@ def update_attachable_to_version2(new_path)
 
 
     def update_file_for_attachable()
-      new_file = mock_file(:original_filename => "version2.txt")
+      new_file = mock_file(:original_filename => "version2.txt", :content_type => "text/plain")
       @attachable.attachments[0].data = new_file
       @attachable.name = "Force Update"
       @attachable.publish_on_save = true
diff --git a/test/unit/lib/acts_as_content_page_test.rb b/test/unit/lib/acts_as_content_page_test.rb
index ebcf56c47..c2307fe95 100644
--- a/test/unit/lib/acts_as_content_page_test.rb
+++ b/test/unit/lib/acts_as_content_page_test.rb
@@ -27,7 +27,7 @@ class MyController < ActionController::Base
     mock_user.expects(:able_to_view?).with(EXPECTED_SECTION).returns(true)
     mock_user.expects(:login).returns("mock_user_name")
     c = MyController.new
-    c.expects(:current_user).returns(mock_user)
+    c.expects(:current_cms_user).returns(mock_user)
 
 
     c.check_access_to_section
diff --git a/test/unit/mock_file_test.rb b/test/unit/mock_file_test.rb
index f9a66ed81..b3b00a00d 100644
--- a/test/unit/mock_file_test.rb
+++ b/test/unit/mock_file_test.rb
@@ -12,8 +12,8 @@ def teardown
 
 
   test "mock files can have data read from them" do
-    file = mock_file(:original_filename=>"version1.txt")
+    file = mock_file(:original_filename=>"version1.txt", :content_type => 'text/plain')
     assert_not_nil file.path
     assert_equal "v1", open(file.path) { |f| f.read }
   end
-end
\ No newline at end of file
+end
diff --git a/test/unit/models/user_test.rb b/test/unit/models/user_test.rb
index 26b36cc58..d7321a5c5 100644
--- a/test/unit/models/user_test.rb
+++ b/test/unit/models/user_test.rb
@@ -67,7 +67,7 @@ def test_disable_enable
     test "email validation" do
       assert @user.valid?
 
-      valid_emails = ['t@test.com', 'T@test.com', 'test@somewhere.mobi', 'test@somewhere.tv', 'joe_blow@somewhere.co.nz', 'joe_blow@somewhere.com.au', 't@t-t.co', 'test@somewhere.x', 'test@somewhere..']
+      valid_emails = ['t@test.com', 'T@test.com', 'test@somewhere.mobi', 'test@somewhere.tv', 'joe_blow@somewhere.co.nz', 'joe_blow@somewhere.com.au', 't@t-t.co', 'test@somewhere.x']
       valid_emails.each do |email|
         @user.email = email
         assert @user.valid?
@@ -342,4 +342,4 @@ def test_guest
     end
 
   end
-end
\ No newline at end of file
+end