added editor to overview.xml
updated dependencies
fixed merge conflicts
updated template with texteditor
updated dependencies
Merge pull request #30 from sulu-cmf/feature/ckeditor

ckeditor