# 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

# Conflicts:
#	VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
#	VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
#	VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs

# Conflicts:
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs

* commit '0a18727d':
  fix datatype limitation in xsd
  fix datatype limitations in XSD
  update build script: create zip file in solution folder
  new vecto release
  use static method to get vecto version
  adapt method of computing gearshift count
  removing job-files not allowed in declaration mode
  adding tests for expected gearshift count
  update results of VECTO 3.2.0.1005 with correct vsum and fc-comparison
  change method to obtain vecto version number: instead of reading out from dll, use (same) t4 macro to statically compile the version number as static property; slightly adapt build process to compile t4 macros
  update valueinjecter to version 3.1 (.net 4.0) - used in bus auxiliaries
  remove unused configurations

* commit '6155aaef':
  fix datatype limitation in xsd
  fix datatype limitations in XSD

Merge pull request #538 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-589-scheme-.xml-error to master

* commit 'c9bca854':
  fix datatype limitation in xsd

Merge pull request #536 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-589-scheme-.xml-error to master

* commit 'b97fb23c':
  fix datatype limitations in XSD

* commit 'fe43a605':
  update build script: create zip file in solution folder

* commit '2c8f3d0f':
  update build script: create zip file in solution folder

* commit '66344824':
  new vecto release

* commit 'd076e36c':
  new vecto release

Merge pull request #531 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-586-gearshift-count-too-high to master

* commit 'a7e12806':
  use static method to get vecto version
  adapt method of computing gearshift count
  removing job-files not allowed in declaration mode
  adding tests for expected gearshift count

Merge pull request #530 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-586-gearshift-count-too-high to develop

* commit 'a7e12806':
  use static method to get vecto version
  adapt method of computing gearshift count
  removing job-files not allowed in declaration mode
  adding tests for expected gearshift count
  update results of VECTO 3.2.0.1005 with correct vsum and fc-comparison