Calendar & ckeditor bug fix