Merge branch 'KB_mapping__Andreas'

# Conflicts:
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/CNSTRNT-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/EMWET-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-info.json
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/HANGAR-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/MTOW-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/MTOW-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/OBJ-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/Q3D-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/Q3D-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SCAM-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SCAM-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SMFA-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SMFA-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/TUDWingDesign-base.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/add_uids.py
#	pyKADMOS/sample/XMLutilities.py
#	pyKADMOS/sample/graph.py
#	pyKADMOS/sample/initiation.py
#	pyKADMOS/scripts/AGILE_EY01_DEMO.py
#	pyKADMOS/scripts/Andreas_development_scripts/KB_init_test.py
#	pyKADMOS/scripts/Andreas_development_scripts/performance_test_iter_product_2.py
#	pyKADMOS/scripts/exampleGraphsD3js.py


Former-commit-id: cc1ab8cc0417dc9edebfae6b74e745bfdf5a4992