merging richtext-editor branch into master