Merge pull request #1705 from stevewithington/candidate

ckeditor/plugin updates
Merge branch 'candidate' of git://github.com/blueriver/MuraCMS into candidate