Conflicts:
	VECTO/GUI/F_GBX.vb
	VECTO/Input Files/cGBX.vb
	VECTO/cDeclaration.vb
	VectoCore/VectoCore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/VectoCore.csproj
	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs

if both, engine and torque converter are happy, return Delta = 0,
otherwise find operating point suitable for both engine and torque converter, compute delta for torque converter output (for search operating point)

testcase + bugfix for torque converter data (finding correct segment for torque ratio / torque calculation

Merge pull request #241 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-319-columns-in-sum-file to develop

* commit 'f5415b56':
  updated test mod and sum files
  added missing Engine to tests
  updated test mod and sum files for measured speed and pwheel tests
  SumFile: Changed E_ENG_POS and E_ENG_NEG to E_CLUTCH_POS and E_CLUTCH_NEG
  removed not needed declaration data files
  added angular gear in Generic Vehicle Data
  corrected error in reading the wheels from declaration files
  VECTO-319: Columns in SumFile, ModFile: Added fields P_fcmap_pos, P_angle_loss, P_tc_loss, E_fcmap_pos, Renamed P_eng_out_pos/neg to P_clutch_pos/neg

Merge pull request #240 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-318-update-steering-pumps to develop

* commit 'e51cd5c7':
  resharper refactoring
  updated values in test
  updated job files in generic vehicle and test data
  removed Once-Method (not needed)
  better handling of null values if the runs were not successful (happend on cancel of the runs)
  GUI changes (removed special color for V3-only panels)
  updated time string to UTC and ISO8601
  updated generic vehicle job files to V3
  upgrade declaration data for Vecto V2 (GUI only)
  updated auxiliaries in job file. from now on incompatible to Vecto Job V2