cke editor changes
Merge branch 'master' of github.com:nemisj/lost