Document and documentexporter

Fixed doc_exporter and document template
Merge remote-tracking branch 'origin/configit_dev' into configit_dev

Conflicts:
	Model/Haarslev_industries.xml
resolved conflict