Moved merge of default options with given ones to render method
Merge branch 'master' of github.com:diem-project/dmCkEditorPlugin