Merge remote-tracking branch 'refs/remotes/upstream/master'
implemented CKEditor
Merge pull request #7 from Steve-Tredinnick/master

Implementing CkEditor