ckeditor/plugin updates
Merge pull request #1705 from stevewithington/candidate

ckeditor/plugin updates