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

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