# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs

Merge pull request #26 in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1353-whr-power-fuel-map-reduced-by-factor-5 to develop

* commit '29cb4e93':
  bugfix: whr power was always multiplied with the ESS utility factor even when the ICE was on. correction: introduce dedicated method for writing whr entries when ice is off (instead of overriding method from base class)

bugfix: whr power was always multiplied with the ESS utility factor even when the ICE was on. correction: introduce dedicated method for writing whr entries when ice is off (instead of overriding method from base class)

fix case where gearshift happens and braking results in negative braking power - perform roll action

new feature: allow engine off only if ESS is enabled in the vehicle. new testcases, new modeldata (allow ess for existing models)

# Conflicts:
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Merge pull request #25 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1317-adaptations-for-bus-evaluations to develop

* commit '2e35f722':
  updating version number, new build for distribution
  adding updated PIF for generic vehicle, update single bus generic vehicle, renaming generic vehicle
  update release notes, update version number
  adapting CIF for completed bus: remove vocational, sleeper cab; add passenger mass (instead of payload) calculate specific FC as average of all missions
  adapt expected values due to changes in passenger density IU/LL
  remove payload (kg) from CIF completed bus
  updating xml for generic completed bus
  remove results FC/t-km for CIF completed bus
  update result due to changed payload
  adapt passenger density IU/LL

testpowertrain hybrid strategy: initialize engine auxiliaries to use correct angular speed for calculation