Update CKEditor to version 4.0.1 and change to inline editing
Add File Manager to CKEditor to allow uploading of images
Refactor and improve File Manager Code
Improve UI and Usability of CKEditor Inline Editing
Made the editor toolbox always visible
Merge branch 'master' into update-editor
WIP
Merge branch 'master' into update-editor