# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
#	VectoCore/VectoCoreTest/Reports/ModDataTest.cs

Merge pull request #434 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-516-axlegear-losses-for-estimation to develop

* commit '9985a18b':
  adapt expected fc due to changes in estimating losses (diffeent GS behavior)
  fix: better estimation of axle losses for estimating acceleration

Merge pull request #433 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-515-cleanup-code-issues to develop

* commit '7b53b060':
  revert changes due to refactoring
  formatting
  restore previous behavior of axlegear losses for acceleration estimation (bug filed)
  revert wrong code-change
  make testcases run after some refactoring
  more cleanup
  code cleanup
  remove dead code
  remove unused parameters
  refactor declarationrundatafactory: simplify nextrun() method
  remove separation of full-load curve into gbx fld and engine full-load curve; only use engine-full-load curve (refactor reader)
  adding license header to source files
  removing license

remove separation of full-load curve into gbx fld and engine full-load curve; only use engine-full-load curve (refactor reader)

Merge pull request #432 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-514-sort-entries-in-vsum-file-numerically to develop

* commit 'd5bd613a':
  adding new column for correct sorting, change signature of writeSumData passing job number and run-number

adding new column for correct sorting, change signature of writeSumData passing job number and run-number

Merge pull request #431 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-513-fix-namespace-of-generated-xml to develop

* commit '4480f938':
  add vehicle idling speed to test input data (xml generation)
  adding namspace parameter

Merge pull request #430 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-512-add-version-information-to-.vsum to develop

* commit '1ecffdc2':
  remove no-longer needed method
  add parameter to add version information to vsum and vmod files

Merge pull request #429 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-511-add-engine-idle-speed-to-gui-vehicle to develop

* commit '74eb7fa4':
  adding input field for vehicle idling speed to Vehicle form, adapt reader and writer

Merge pull request #428 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-510-write-xml-reports-in-declaration to develop

* commit '29ca1498':
  renaming reports, open links from GUI (notepad, explorer) for XML files

Merge pull request #427 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-509-add-axle-type-driven-non-driven to develop

* commit 'ea97baa5':
  add axle type to vehicle dialog, write axle type into json job, read axle type from json job (optional), changing labels, correction enable/disable PTO in declaration mode

add axle type to vehicle dialog, write axle type into json job, read axle type from json job (optional), changing labels, correction enable/disable PTO in declaration mode

Merge pull request #426 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-506-torque-converter-change-method to develop

* commit '43f8da22':
  adapt testcase due to different append method
  add only last point of TC curve

Merge pull request #425 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-507-add-feature-to-skip-vectorun-validation to develop

* commit '25a31cce':
  add flag to skip validation of run data