Added EntityResolver so theme-merge works on a server without an internet connection where DTD files can't be retrieved