Merge branch 'master' into importDotx

# Conflicts:
#	src/import-dotx/import-dotx.ts

src/file/xml-components/xml-component.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "tests/utility";
 import { XmlComponent } from "./";
 
 class TestComponent extends XmlComponent {}