Merge branch 'master' into dev_distr_architectures_surr_models

# Conflicts:
#	examples/scripts/sellar_problem.py
#	examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-OPT-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-OPT-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-OPT-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-OPT-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/RCG.pdf
#	examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-OPT-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-OPT-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-OPT-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-OPT-J.xml
#	examples/scripts/sellar_problem/CMDOWS/RCG.xml
#	examples/scripts/sellar_problem/KDMS/FPG_IDF.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_MDF-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_MDF-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-OPT-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-OPT-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_IDF.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-OPT-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-OPT-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-OPT-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-OPT-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/RCG.kdms
#	examples/scripts/sellar_problem/VISTOMS/VISTOMS.html
#	examples/scripts/ssbj.py
#	examples/scripts/ssbj/(X)DSM/FPG_MDF-GS.pdf
#	examples/scripts/ssbj/(X)DSM/FPG_MDO.pdf
#	examples/scripts/ssbj/(X)DSM/RCG.pdf
#	examples/scripts/ssbj/CMDOWS/RCG.xml
#	examples/scripts/ssbj/VISTOMS/VISTOMS.html
#	examples/scripts/tu_delft_wing_design.py
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_IDF.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_MDF-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_MDF-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_converged-DOE-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_converged-DOE-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_converged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_converged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-DOE-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-DOE-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-OPT-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-OPT-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_IDF.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_MDF-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_MDF-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_converged-DOE-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_converged-DOE-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_converged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_converged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-DOE-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-DOE-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-OPT-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/Mdao_unconverged-OPT-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/RCG.pdf
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_IDF.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_MDF-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_MDF-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_converged-DOE-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_converged-DOE-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_converged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_converged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-DOE-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-DOE-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-OPT-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-OPT-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_IDF.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_MDF-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_MDF-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_converged-DOE-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_converged-DOE-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_converged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_converged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-DOE-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-DOE-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-OPT-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-OPT-J.xml
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_IDF.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_MDF-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_MDF-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_converged-DOE-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_converged-DOE-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_converged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_converged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-DOE-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-DOE-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-OPT-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-OPT-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_IDF.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_IDF_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_MDF-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_MDF-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_MDF-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_MDF-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-DOE-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-DOE-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-DOE-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-DOE-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-MDA-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_converged-MDA-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-DOE-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-DOE-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-DOE-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-OPT-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-OPT-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-OPT-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-OPT-J_mpg.kdms
#	examples/scripts/tu_delft_wing_design/VISTOMS/VISTOMS.html
#	kadmos/cmdows/cmdows.py
#	kadmos/graph/graph_data.py
#	kadmos/graph/graph_kadmos.py
#	kadmos/utilities/general.py


Former-commit-id: 8992e3ca1248433773e973a45e239f6ce4046be5