* commit '53b878d0':
  adding checklist for release
  new VECTO Release
  correcting testdata
  adding missing file, renaming testcase
  updating changelog
  updating lilcense number
  updating license header in new files
  adding testcase validating xml reports
  adding testcases to detect VTP cycles
  adding testcase for format of vmod and vsum files
  bugfix: correct calculation of acceleration in case simulation intervals are split up
  add condition in measured speed cycle: if the remaining interval to the next sampling point is too low, reduce the current simulation interval and thus prolong the next one
  adding testcase for xml declaration vehicle without airdrag component
  check if airdrag node exists, oterwise return null (uses standard values)

* commit 'ae197fe0':
  adding checklist for release
  new VECTO Release
  correcting testdata
  adding missing file, renaming testcase
  updating changelog
  updating lilcense number
  updating license header in new files

Merge pull request #544 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-592-eptp-simulation-mode to develop

* commit 'da2d101a':
  refactoring of VTP engine - no speed limits, compute engine torque demand based on power demand and engine speed from cycle to compensate for wrong gear selection

refactoring of VTP engine - no speed limits, compute engine torque demand based on power demand and engine speed from cycle to compensate for wrong gear selection

Merge pull request #543 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-599-vecto-crash-when-retardation-is to master

* commit 'cd1417a8':
  bugfix: correct calculation of acceleration in case simulation intervals are split up
  add condition in measured speed cycle: if the remaining interval to the next sampling point is too low, reduce the current simulation interval and thus prolong the next one

add condition in measured speed cycle: if the remaining interval to the next sampling point is too low, reduce the current simulation interval and thus prolong the next one

Merge pull request #542 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-605-improve-simulation-speed to develop

* commit '7c277920': (31 commits)
  make project compile, cleanup imports
  additional SI classes for 'special' units, extensive tests for all conversion methods
  formatting output, fix conversion methods
  make all testcases green
  use new SI interface
  use new SI interface
  remove braces
  use new SI methods, add tolerance to testcase
  update file
  merged with current Vecto debug, removed "hamster" code
  Removed obsolete Code, established compatiblity of ConvertedSI with Moddata Table Column types
  merge
  VectoCSVFile: changed write method (added own case for ConvertedSI formatting)
  texttemplating path updated for visual studio 2017
  removed GtoKG and _isMass
  Refactored: Naming conventions, formatted source code, removed unneccessary methods
  Made Auxiliary tests compileable
  Corrected Path to TextTemplating Engine
  remane a few methods
  finished for refactoring.
  ...

Merge pull request #541 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-602-error-in-simulation-without-airdrag to master

* commit 'ad064b96':
  adding testcase for xml declaration vehicle without airdrag component
  check if airdrag node exists, oterwise return null (uses standard values)

Merge pull request #540 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-592-eptp-simulation-mode to develop

* commit 'c4a95ecb':
  bugfix: if wheelspeed is 0 set torque to 0
  adding documentation for VTP mode

Merge pull request #539 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-592-eptp-simulation-mode to develop

* commit '76c8c10e':
  fix testcase due to changes in HVAC table
  update calculation of gears in VTP mode
  renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed dependent), correction of engine fan equation
  renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed dependent), correction of engine fan equation
  adapt build scripts, build configuration
  more work on eptp mode
  started working on EPTP powertrain creation
  loading/storing eptp jobs works (GUI)
  fixes for GUI: saving works
  extend jsoncomponentdata to match new structure
  refactoring of input data provider structure: components are accesible via vehicle, not job
  refactoring of input data provider structure: components are accesible via vehicle, not job
  adding gui for EPTP Mode
  update repo

# Conflicts:
#	VECTO.sln
#	VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs

Merge branch 'feature/VECTO-592-eptp-simulation-mode' of git+ssh://129.27.107.191:2211/vecto-sim into feature/VECTO-592-eptp-simulation-mode

renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed dependent), correction of engine fan equation

renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed dependent), correction of engine fan equation