TextEditor for text and expressions in PropertyGrid,
Editor for FormatString
Merge branch 'master' of github.com:icsharpcode/SharpDevelop