Fixed hard/soft return in CKEditor

Return = paragraph
Shift+Return = line break
Merge pull request #2369 from donaldallen/feature/ckeditor-fix

Fixed hard/soft return in CKEditor