Conflicts:
	App/inc/FitSuiteObserverFactory.h
	App/src/FitSuiteObserverFactory.cpp
	Core/Core.pro
	Core/Tools/src/OutputDataReadStrategy.cpp
	Core/Tools/src/OutputDataWriteStrategy.cpp