CKEditor2 -> CKEditor4
Merge branch 'master' of github.com:10layer/10Layer-LS