Merge branch 'hotfix/order'
Add rich text editor