Merge "Simple TextEditor demo." into devel/master