phil messed up the styles again
Merge remote-tracking branch 'remotes/upstream/master'
removed ckeditor references