Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1082-include-waste-heat-recovery-systems

# Conflicts:
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/Input Files/VectoJob.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Factory/IEngineeringReaderInjectFactory.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/NinjectModules/XMLEngineeringReaderV10InjectModule.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/IXMLDriverDataReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd
#	VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs