* Bug fix: ckeditor patch updated to correspond with the new ckeditor module release.
Merge branch 'dev'