Bump ckeditor and wysiwyg versions.

ckeditor 3.6.2 doesn't work properly for IE 10. It isn't possible to make line breaks (hitting 'enter' doesn't make a new line).
Merge pull request #3 from odensecentralbibliotek/bump_ckeditor

Bump ckeditor version.
Resolved merge conflict in make file with core