bugfixes

add missing import of logging
fix image parameter handling
se cockpit fixes
more se cockpit fixes
meta

tested enablers per experiment
few fixes
bugfix for uptake in meta structure
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
update docx submodule
adjust gitignore
adjust gitignore
jobs for all WP7 deliverables, reenable exception handling for jobs
newlines
jobs for D3.3.1 and D7.6.1