- Improved characters escaping for text with HTML mark-up (UnitTest complaint)
- Improved characters un-escaping for text with HTML mark-up (UnitTest complaint)
- Added a couple of tests for escaping mixed with HTML mark-up