(cherry picked from commit 1cfc4cee)

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

Merge pull request #7 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev:feature/VECTO-975-implementing-eco-roll-with-and-without-engine-stop to develop

* commit '8be10cbd':
  adding testcase for eco-roll with AT
  adding ttestdata for at eco-roll, updating testcases for AT ecor-roll
  updating repo
  don''t allow eco-roll for MT gearboxes, ignore ecoroll with engine-off for AT gearboxes
  add status about eco-roll conditions to state class, write eco-roll condition to mod-file
  change criterion for eco-roll
  implementing eco roll and eco roll with engine stop. testcases with class 5 vehicle and simple cycles
  setting eco-roll data
  refactoring: remove deprecated underspeed from overspeed/ecoroll parameters, adding dedicated eco-roll input parameters
  moving and renaming declaration data field
  adding testdata for eco roll
  refactoring engineeringdriverdata: use separate data provider for ess and eco roll

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-975-implementing-eco-roll-with-and-without-engine-stop

# Conflicts:
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/VersionNumber.t4

adding correction for WHR power in vsum and declaration reports, adding whrtype to manufacturer report

updating interface for WHR data, adding whr reader, whr lookup map, moving readers into correct folder

Merge pull request #6 in VECTO/vecto-dev from ~EMQUARIMA/vecto-sim-ff:feature/VECTO-1073-support-for-dual-fuel-engines to develop

* commit '72fb9634': (65 commits)
  allow engine modes also in engineering mode, make testcases green
  adding dual-fuel modes for engine, mod-data, sum-data, all input data
  updating monitoring schema. introduce abstract xml type for monitoring report so that different versions can be used without updating monintoring schema
  adding schema for xml reports
  adding XML Schema for Dual Fuel engines, sample component file, sample vehicle file with dual fuel engine
  fix for refactoring moving report writer to base class
  adding testcases for filtering 'duplicate' entries in driving cycle. if vair_res and vail_beta are provided intermediate cycle entries must not be deleted.
  refactoring: declaration report - move writer from xmlreport to base class
  Make project compile
  bugfix: use correct shiftloss energy in second simulation interval when shift losses are split among two intervals
  dding testcase for splitting shift losses among 2 simulation intervals
  adding missing files
  chaning layout, adding browse directory button
  updating user manual
  reduce log-level in case time shares in sum-data does not sum up to 100%, increase tolerance
  adding configuration option for output folder to gui and for initializing filewriters  when running simulation
  driverstrategy: switch to braking phase immediately if nextdrivingaction.action is set to braking (instead of doing the same calculations again
  fix: idle controller, double-clutch: searching engine speed in case of overload resonse
  fix merge
  fix merge
  ...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1073-support-for-dual-fuel-engines

# Conflicts:
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
#	VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
#	VectoCore/VectoCoreTest/Reports/SumWriterTest.cs

updating monitoring schema. introduce abstract xml type for monitoring report so that different versions can be used without updating monintoring schema