ckeditor config edit
Merge pull request #1098 from stevewithington/develop

ckeditor config edit