Bug491

Replaces tinyxml with tinyxml2.