Conflicts:
	VECTO/File Browser/FB_Global.vb
	VECTO/GUI/F_VEH.Designer.vb
	VECTO/GUI/MainForm.vb
	VECTO/GUI/VehicleForm.vb
	VECTO/Input Files/cVEH.vb
	VECTO/VECTO_Types.vb
	VectoCore/VectoCore/InputData/Reader/ComponentData/RetarderLossMapReader.cs
	VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCore/VectoCore.csproj
	VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs

* commit 'a6deba36':
  corrected error in engine inertia computation for GUI, removed checkbox for TC (only depends on transmission type)

corrected error in engine inertia computation for GUI, removed checkbox for TC (only depends on transmission type)

Merge pull request #251 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-333-remove-folder-with-declaration to develop

* commit 'd93ea5e9':
  more refactoring
  refactoring: variable names match coding style, more cleanup (engine)
  Refactoring: renaming classes to fit naming conventions
  removing commented lines (during refactoring/removing vecto 2.2 core), removing redundant qualifiers
  more cleanup: remove batch tab, remove developer options, remove shutdown, remove cmdline args
  removing declaration folder
  adapting vecto gui to get rid of 'Declaration' Folder and use declaration data from vecto core; refactoring, removing no longer required files / classes
  refactoring reading retarder type, adding missing file, physics constants also in declaration class
  allow lookup of (currently) disabled vehicle classes (for GUI)
  provide method to convert velocity to km/h
  extending auxiliaries classes to provide list of available auxiliaries (for GUI)
  extending helper classes for enums (to be useful for GUI)

removing commented lines (during refactoring/removing vecto 2.2 core), removing redundant qualifiers

adapting vecto gui to get rid of 'Declaration' Folder and use declaration data from vecto core; refactoring, removing no longer required files / classes

AddComponent for Engine, removed container and idleController is default null (and will be taken from Engine)

DistanceBasedDrivingCycle: Implemented PTOCycle Stop, refactored GetStopTimeInterval to own function.

DrivingCycleDataReader: Set PTOActive to false when duplicating distance entries due to 0km/h and stop.

Merge pull request #250 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-324-it-is-not-possible-to-perform-a to develop

* commit '3ca18bc7':
  extend sirange class to allow different ranges depending on the execution mode; change valid range for gross vehicle weight depending on declaration or engineering mode

extend sirange class to allow different ranges depending on the execution mode; change valid range for gross vehicle weight depending on declaration or engineering mode

Merge pull request #249 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-331-measured-speed-mode-with-gear-ignore to develop

* commit 'fa13c916':
  removed cycle clutch for measured speed w/ gear, deleted cycle clutch

Merge pull request #248 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-330-support-tc-in-measured-speed to develop

* commit '576763fa':
  adapting cycle gearbox when using torque converter (incl. some refactoring), adding testcases for measured speed powersplit and serial TC
  adding column tc_active to driving cycle (measured speed), extending cycle gearbox by torque converter, adding testdata for measured speed test AT gearbox

adapting cycle gearbox when using torque converter (incl. some refactoring), adding testcases for measured speed powersplit and serial TC

adding column tc_active to driving cycle (measured speed), extending cycle gearbox by torque converter, adding testdata for measured speed test AT gearbox