Merge pull request #5 from Zentyal/mjulian/update-ckeditor

Mjulian/update ckeditor
Merge branch 'master' into precise-cloud