Rich editor
Merge branch 'niceedit'
.
Merge branch 'niceedit'