Merge branch 'master' of https://github.com/sfereno/docxgenjs
- recovery
- recovery
Revert "- Resolved merge conflict"

This reverts commit 8406d3cebf256ac18cf18176b816c4e12350201d.