Adding ckeditor4 and Updated 2.2 base to fix conflicts
accidental file inclusion
Merge pull request #2217 from ryun/feature-ckeditor4

Update to ckeditor 4 and Updated local 2.2 base to fix conflicts