Merge summernote develop to alwDevelop