Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate

# Conflicts:
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/circleLayout.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/json/catschema_roleLev.json
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/xdsm.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/KADMOS_VisPack.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/circleLayout.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/AGILE_Background.png
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/AGILE_Icon.png
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/KADMOS_VisualizationPack_Logo.png
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/acknowledgements.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/json/catschema_funLev.json
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/json/serviceView.json
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/serviceView.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/xdsm.html
#	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/xdsm.js
#	pyKADMOS/scripts/WP6_TUDWingDesign_work.py
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_FPG_vispack/supportFiles/json/xdsm.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_RCG_vispack/supportFiles/json/xdsm.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-MDA_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-MDA_Jacobi.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_unconverged-MDA-GS_vispack/supportFiles/json/xdsm.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_unconverged-MDA-J_vispack/supportFiles/json/catschema_roleLev.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/circleLayout.html
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_02.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_10.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_roleLev_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_02.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_10.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_01.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_02.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/xdsm.html
#	pyKADMOS/scripts/script_DC1_MDA.py


Former-commit-id: 3d9139ed0c91ebb1322e685aa8ec7704eaef7556