Improved escape and unescape of resources with HTML markup, aligning them to how Android handle them, and added specific unit tests.