Merge branch 'master' into develop

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/Input Files/cVECTO.vb
	VECTO/MODcalc/cPower.vb
	VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
	VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
	VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs