Merge branch 'WES' into 'dev'

commonFunctions/control/control_Interp.prj

commonFunctions/odeFunctions/ascentControl.m

commonFunctions/odeFunctions/descentParafoil.m

parafoilIdentification/mainParafoilIdentification.m

simulator/configs/configFlags.m

simulator/configs/configPayload.m

simulator/mainSimulator.m

simulator/src/std_plots.m

simulator/src/std_run.m

simulator/src/std_run_parts/run_parafoilGuidance.m

simulator/src/std_run_parts/std_setInitialParams.m

simulator/src/std_run_parts/std_subsystems.m