Adding ckeditor
Merge branch 'master' of https://github.com/Aeonor/mockup.git