Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-238-look-ahead-coasting

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
	VectoCore/VectoCore/Utils/VectoCSVFile.cs

* commit '725ca60e':
  fix: add techlist when provided in input data
  add test to check techlist for json input data

Merge pull request #209 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:hotfix/VECTO-300-technology-selection-not-considered to master

* commit 'b56a2f22':
  fix: add techlist when provided in input data
  add test to check techlist for json input data

fix search algorithm: computation does no longer use SI classes, so no exception (div 0, NaN) is thrown. check for Inf and NaN and abort search

cycleGearbox: when accelerating: read next sampling point, when decelerating read last sampling point for current gear

Conflicts:
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx
	Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh
	VECTO/GUI/F_VECTO.Designer.vb
	VECTO/Input Files/cVECTO.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
	VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
	VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
	VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCoreTest/FileIO/JsonTest.cs

Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCoreTest/FileIO/JsonTest.cs

* commit '752d918d':
  update version number
  code formatting
  print FC-AAUX and FC-Final in .vmod file
  read cycle time from config file
  allow access to VectoCore for certain fields
  code formatting
  adding cycle time to pneumatics activation file
  update documentation on AAUX columns in .vmod
  update release notes
  fix: plotting gearshift lines (loading vehicle file)
  updating changelog
  update release notes
  allow vecto gui to access internals of vecto core
  plot declaration shift lines as computed by vecto core (vecto 3)
  skip shift lines in overview image (Vecto job), make vecto file accessible
  update release notes
  update version number
  make tests run again