fix wiki page link generation
Merge branch 'stable' of https://github.com/stlemme/python-dokuwiki-export into stable
jop for word export (docx generation)
fix for transitive includes
wip
fix for transitive includes
reactivate images, command line arguments
fix for whitespaces after headings, generic deliverable generation
Merge branch 'docx-generation' into fixes

Conflicts:
	aggregate.py
	docxgenerate.py