added ckeditor
most of the way through integrating ckeditor
Merge branch 'master' into kingman