N2cms 2.5

Moved ckeditor into new 2.5 branch (please delete the ckeditor branch)

-Ben