Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-dev into develop

# Conflicts:
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoCSVFile.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4

Merge pull request #755 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-967-engine-only-mode-engine-torque-reported-in-.vmod-does-not-match-the-provided-cycle to develop

* commit '0ca63d2d':
  fix: time offset in .vmod file - first entry in cycle is assumed to be steady state, first simulation step uses 2nd entry in cycel
  fix: don't re-compute engine torque from average enine power with average engine speed

fix: time offset in .vmod file - first entry in cycle is assumed to be steady state, first simulation step uses 2nd entry in cycel

Merge pull request #754 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-966-allow-selecting-tank-system-for-ng-engines-in-gui to develop

* commit '6e7e293f':
  adding ng tank system to vehicle dialog

Merge pull request #753 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-965-add-input-fields-for-adas-into-vecto-gui to develop

* commit 'eddbac88':
  updating documentation on ADAS options also in gui

Merge pull request #752 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-965-add-input-fields-for-adas-into-vecto-gui to develop

* commit '961a109e':
  correction of testcase with invalid eco roll option
  adding adas input parameters to gui, new vehicle file version with ADAS parameters
  refactoring: use enum instead of two booleans for ecoroll combination

Merge pull request #751 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-954_attemtp2 to develop

* commit 'e1c52dc0':
  fix testcase : duplicate entries in FLD are not allowed
  when searching for TC operating point on engine drag curve, enforce engine speed slightly above idling speed to avoid issues due to precision and search tolerance
  clear shiftlossenergy if remaining shift time is non-negative; check TC operating point if possibe for engine (case creeping)

when searching for TC operating point on engine drag curve, enforce engine speed slightly above idling speed to avoid issues due to precision and search tolerance

clear shiftlossenergy if remaining shift time is non-negative; check TC operating point if possibe for engine (case creeping)

Merge pull request #750 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-950-error-when-loading-engine-full-load-curve to develop

* commit '1caa8840':
  correcting type
  throw exception in case an engine speed occurs multiple times
  adding testcase for engine FLD with multiple entries for same engine speed

* commit '0cec01fa':
  cleanup
  removing old xmlspy project file, sorting datatypes in xsd,
  restructuring: move torqueconverter component from gearbox to components (internal data structures), use full xsd type for naming injection bindings
  adding parsing of schema versions 2.1 and 2.2
  implementing reading XMLs V2.0
  starting reading xml v2
  xmlreader/xmlinputdata: making fields protected and properties virtual
  restructuring, moving around files
  refactoring: adding engineering xml schema, engineering xml reader and engineering xml writer
  make testcases work
  use correct namespace definitons in test data
  refactoring XML reading: use version-specific reader classes, use ninject for loading correct classes
  adding engineering xml schema (not implemented yet)
  adding examples to xmlspy project
  adding XML example files
  refactoring XML Schema - version 2.0 (original 1.0), 2.1 (new parameters according to 2019/318), 2.2 (new tyre dimensions - not official yet)
  adding missing files
  adding schema versions 2.0, 2.1 (amendments 2017/2400), and 2.2 (new tyre dimensions)
  introducing abstract base types in 1.0 XML schema

# Conflicts:
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs
#	VectoCore/VectoCoreTest/XML/XMLWritingTest.cs

Merge pull request #748 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-931-at-error-in-vecto-version-3.3.2.1519 to develop

* commit 'f3a10008':
  AT shift strategy: avoid emergency upshift from TC to locked if acc in locked gear is less than 0
  avoid null-reference execption

restructuring: move torqueconverter component from gearbox to components (internal data structures), use full xsd type for naming injection bindings

Merge pull request #747 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-932-consistency-in-na-values-in-the-vsum-file to develop

* commit '5e459bf8':
  adapt testcase to new 'not available' abbreviation
  use constant for different writings of 'not available' throughout the code