editor tweaks
Merge branch 'master' of https://github.com/calliopeinitiative/marca
move ckeditor to bundle deployed through form builder
removed old ckeditor
display tweaks