Fix the issue with character encoding when overlaying text.
Add the XML header to these files.
Make sure derived.xml has the encoding written out.
Some more cleanup of the xml headers
Merge branch 'master' into progressiveResolution