Merge branch 'Cole'
Merge branch 'Cole'
rework textEditor

Concisify code for textEditor.
Merge branch 'master' into Cole