Backmerge Master into Develop after hotfix

Author: ElliottAYoung

cortex-plugins-core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "cells-rails", "~> 0.0.6"
   s.add_dependency "cells-haml", "~> 0.0.10"
   s.add_dependency "mimemagic", "~> 0.3.2"
-  s.add_dependency "ckeditor", "~> 4.2.0"
+  s.add_dependency "ckeditor", "= 4.2.0"
 
   s.add_development_dependency "sqlite3"
 end

lib/cortex/plugins/core/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.4.7'
+      VERSION = '0.4.8'
     end
   end
 end