Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/TransmissionComponent.cs
	VectoCore/VectoCoreTest/Utils/SITest.cs

Merge pull request #505 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-566-vehicle-height-is-not-read-correctly to develop

* commit '24a5d7ad':
  read vehicle height into GUI

Merge pull request #502 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/Export-Shift-Curve to develop

* commit '83d756ea':
  Added Button in Gearbox-Form to export currently selected ShiftPolygon to a new .VGBS file in the job-file directory

Merge pull request #504 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-564-vehiclegroup-xml-output to develop

* commit 'b6e1a1c3':
  fix: set vehicle group before initializing report
  remove comments, correct assertion
  adding testcase to reporduce bug

* commit '9515a65f':
  removing MS Unit Test Framework
  switch to NUnit testframework
  remove legacytest project (Vecto 2.2)
  making testcase work with nunit 3.7
  change working directory for nunit tests
  convert all tests to nunit
  removing duplicate file
  adapting testcases to run under NUnit 3.7
  switch to NUnit 3.7

Added Button in Gearbox-Form to export currently selected ShiftPolygon to a new .VGBS file in the job-file directory

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

* commit 'dbb48cd8':
  update header in version templates
  build commandline project before vecto, add commandline in package
  removing old XSD versions
  renaming resource file
  adding deployment configuration; move packaging ZIP file to MSBuild (separate build file with additional targets)

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

adding deployment configuration; move packaging ZIP file to MSBuild (separate build file with additional targets)

Merge pull request #500 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-557-engine-speed-simulated-too-high to develop

* commit '3d349a6a':
  adapt testcases due to modified simulation of stop time

Merge pull request #499 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-557-engine-speed-simulated-too-high to develop

* commit 'c94d74bb':
  fix: waiting time has to be from previous state

Merge pull request #498 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-557-engine-speed-simulated-too-high to develop

* commit 'dd0a0156':
  fine-grain simulation of stop intervals for more accurate fuel consumption during long stops