SP03 - Fix DF
Merge remote-tracking branch 'origin/master'

Conflicts:
	Satellite/TS02/UserApplication/KCG/Makefile
	Satellite/TS02/UserApplication/KCG/OperationalScenario.a
	Satellite/TS02/UserApplication/KCG/OperationalScenario.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario.dll
	Satellite/TS02/UserApplication/KCG/OperationalScenario.exe
	Satellite/TS02/UserApplication/KCG/OperationalScenario.h
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.bat
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.bin
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.df.xml
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.h
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1.hexa
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1_bat.log
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1_conf.xml
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1_dfgen.log
	Satellite/TS02/UserApplication/KCG/OperationalScenario_UA_1_uaadaptor.log
	Satellite/TS02/UserApplication/KCG/OperationalScenario_cosim.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario_interface.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario_macro.h
	Satellite/TS02/UserApplication/KCG/OperationalScenario_mapping.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario_type.c
	Satellite/TS02/UserApplication/KCG/OperationalScenario_type.h
	Satellite/TS02/UserApplication/KCG/cmd_cg.log
	Satellite/TS02/UserApplication/KCG/config.txt
	Satellite/TS02/UserApplication/KCG/kcg.log
	Satellite/TS02/UserApplication/KCG/kcg_consts.c
	Satellite/TS02/UserApplication/KCG/kcg_consts.h
	Satellite/TS02/UserApplication/KCG/kcg_metrics.txt
	Satellite/TS02/UserApplication/KCG/kcg_s2c_config.txt
	Satellite/TS02/UserApplication/KCG/kcg_sensors.h
	Satellite/TS02/UserApplication/KCG/kcg_trace.xml
	Satellite/TS02/UserApplication/KCG/kcg_types.c
	Satellite/TS02/UserApplication/KCG/kcg_types.h
	Satellite/TS02/UserApplication/KCG/kcg_xml_filter_out.scade
	Satellite/TS02/UserApplication/KCG/make.log
	Satellite/TS02/UserApplication/KCG/missionPhases_newmapping.c
	Satellite/TS02/UserApplication/KCG/missionPhases_newtype.c
	Satellite/TS02/UserApplication/KCG/missionPhases_newtype.h
	Satellite/TS02/UserApplication/KCG/sc2c.log
	Satellite/TS02/UserApplication/KCG/sc2c_integration_files.txt
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario.o
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario_UA_1.o
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario_cosim.o
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario_interface.o
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario_mapping.o
	Satellite/TS02/UserApplication/KCG/win32/OperationalScenario_type.o
	Satellite/TS02/UserApplication/KCG/win32/kcg_types.o