Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VECTO-95-implement-Vehicle

Conflicts:
	VectoCore/Models/Connector/Ports/IDriverDemandProvider.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Models/SimulationComponent/Data/GearboxData.cs
	VectoCore/Models/SimulationComponent/Data/VehicleData.cs
	VectoCore/Models/SimulationComponent/IVehicle.cs
	VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
	VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
	VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
	VectoCore/Utils/SI.cs
	VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/TestData/Components/24t Coach.vveh
	VectoCoreTest/VectoCoreTest.csproj