Update Text Editor & Properties
Merge pull request #262 from jmpascal/MERGING-1

Update Text Editor & Properties