updated todo
Merged ckeditor -> master