Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos

# Conflicts:
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/COOR-UXPathFilter-HANGAR[AGILE_DC1_WP6_wing_startpoint].json
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_IDF.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_MDF-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_MDF-J.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_converged-DOE-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_converged-DOE-J.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_converged-MDA-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_converged-MDA-J.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-J.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-J.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-OPT-GS.wf
#	pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-OPT-J.wf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_IDF.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_MDF-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_MDF-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_converged-DOE-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_converged-DOE-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_converged-MDA-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_converged-MDA-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-DOE-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-DOE-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-MDA-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-OPT-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/FPG_unconverged-OPT-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_IDF.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_MDF-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_MDF-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_converged-DOE-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_converged-DOE-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_converged-MDA-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_converged-MDA-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-DOE-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-DOE-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-MDA-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-MDA-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-OPT-GS.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/(X)DSM/XDSM_unconverged-OPT-J.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign/VISPACK_RCG/supportFiles/json/graphs.json


Former-commit-id: da54f56268eaa12cb1a96f0a944aab2e55391d1a