WYSWIYG Controller fixes.
Closes #2731: Upgraded CKEditor to 4.1.1.