Merge branch 'Cole'
Merge branch 'Cole'
Merge branch 'Cole'
add text fonts for text editor space
edit border-radius of textEditor
Merge branch 'master' into Cole