Conflicts:
	User Manual/help.html
	VectoConsole/Properties/Version.cs
	VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
	VectoCore/Models/Simulation/Data/ModalResult.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/OutputData/IModalDataContainer.cs
	VectoCore/Properties/Version.cs

Merge pull request #155 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-261-driver-strategy-improvements-of to develop

* commit 'dfd98723':
  disable plotting graphs if no v2 results are available, disable extreme tests (25% slope)
  driver: compute acceleration: additional parameter to control whether the acceleration is limited to driver model or not. used when reducing decelration to approach braking curve
  simple driving cycles: corrected: cycle name does not match cycle
  mod-data integrity: skip last entry
  update expected results due to changed column headers
  driver strategy: handle speedLimit response in a separate switch because it may occor also during the second requests.
  fix: if issuing a temporary request to finish gearshift (in case the vehicle stopped), re-issue the original request. otherwise the distance of cycle and vehicle diverge!
  make graphwriter configurable from external code, initialize settigns in testclass
  driver strategy: if the vehicle stopped too early (for whatever reason) drive off again for half of the original distance
  driver strategy / DriverAction Brake: always use 'targetDistance', but if velocity is above theshold add the braking safety margin; targetDistance may only reduce deceleration (i.e. increase acceleration)
  reset braking power before next iteration of requests

driver: compute acceleration: additional parameter to control whether the acceleration is limited to driver model or not. used when reducing decelration to approach braking curve

driver strategy: handle speedLimit response in a separate switch because it may occor also during the second requests.

fix: if issuing a temporary request to finish gearshift (in case the vehicle stopped), re-issue the original request. otherwise the distance of cycle and vehicle diverge!

driver strategy: if the vehicle stopped too early (for whatever reason) drive off again for half of the original distance

driver strategy / DriverAction Brake: always use 'targetDistance', but if velocity is above theshold add the braking safety margin; targetDistance may only reduce deceleration (i.e. increase acceleration)

Merge pull request #154 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-256-re-arrange-cleanup-folder-structure to develop

* commit '6213a194':
  updating nuget packages

Merge pull request #153 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-256-re-arrange-cleanup-folder-structure to develop

* commit 'f61562ae':
  remove json.net version 6
  extracting common classes (SI, input data interfaces, ...) into common project
  adapting solution to changed project locations, re-structure projects into folders
  moving files
  renaming third party lib
  moving around projects
  moving projects to tools / common

Merge pull request #152 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-255-merge-bus-auxiliaries-code-into to develop

* commit 'b9d1bd02': (302 commits)
  changed build order so that make clean && make works
  removing duplicate file ref
  corrected weird formatting
  bugfix: wrong output when brake action requires no search
  fix: check if advanced auxiliaries are set
  added more tests for busAuxAdapter (behavior dependent on drivingbehavior), refactoring auxDemandTest
  adaptations bus-aux adapter, all aaux
  removed extreme testcases
  driver strategy: annouce drivingMode drive, test coach cycle added
  make generic vehicle input files usable (parsing works)
  cMap (Vecto) implements IFuelConsumption Interface (to work with AAUX)
  add further attributes to comparison tests
  more testcases for advanced aux (comparison v3 - v2), all green
  add aaux tests for short driving cycles, added results from vecto2.0+AUX
  bus aux adapter: allow smart aux only during braking, prohibit smart aux during coasting
  pass on dryRun flag
  bus aux adapter: fix engine idle speed in rpm
  use engineAuxProvider in BusAuxAdapter
  introduce flag in fc-map adapter for aaux to control extrapolation
  add bus aux to powertrain builder
  ...

* commit '1ae0adf4':
  new build number

* commit '6dee97d1':
  bugfix: sumfile and pdf report CO2 value is now based on FC-Final
  bugfix: wrong output when brake action requires no search

Merge pull request #147 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:bugfix/VECTO-245-sumfile to develop

* commit '399f0543':
  updated sum file format
  sumfile format independent of ExecutionMode, corrected error (using fcfinal instead of fcmap)
  removed Acc.Noise column in sum file
  removed Acc.Noise column in sumfile, unified format (the same for all ExecutionModes)
  SumFile always the same (regardless of ExecutionMode)
  bugfix: sumfile and pdf report CO2 value is now based on FC-Final

added more tests for busAuxAdapter (behavior dependent on drivingbehavior), refactoring auxDemandTest