Fix default CKEditor base path
Merge branch '2.0'