Conflicts:
	VECTO/GUI/F_MAINForm.vb
	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs

Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

Merge pull request #180 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-167-additional-vmod-in-1hz to develop

* commit '110285b1': (75 commits)
  corrected last line in 1Hz interpolation
  removed duplicate test cases
  added test for mod data in 1Hz, corrected bugs
  moddata clone for 1Hz
  gear calculation in 1Hz mode
  corrected summation and weighting of values in moddata 1Hz mode
  removed deleted file from project
  adapt testcase to newly found operating points
  adapt gearboxdata test due to extended loss map, refactor gearboxdata test to use nunit
  refactor gearbox tests to use nunit; adapt testcases due to enlarged loss map
  adding missing files
  do not write altitude, drivingAction, and driving mode into mod-data
  adapt testcase
  move computation of time interval for driving a certain distance with a certain acceleration to VectoMath
  increase constant for min. time interval
  extend loss maps to negative torques (to be symmetrical)
  introduce constant
  do not disengage during dry-run
  gearbox: when halted: disengage until next time interval; if driver is braking and braking power > 0 and clutch would be slipping and vehicle is below certain threshold -> disengage for the current time interval
  code used when debugging the tests (commented out)
  ...

Merge pull request #179 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:hotfix/VECTO-271-distancerun-unexpected-response to master

* commit '3d38f241':
  FullLoadCurve: Removed fallback to engine full load curve in gearbox in declaration mode
  [VECTO-271] corrected error: DistanceRun got an unexpected response: ResponseGearShift

Merge remote-tracking branch 'markus/feature/VECTO-238-look-ahead-coasting' into feature/VECTO-167-additional-vmod-in-1hz

Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
	VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
	VectoCore/VectoCoreTest/VectoCoreTest.csproj