CKeditor link und Date
Merge branch 'master' of github.com:criscom/felin