# Conflicts:
#	Tools/VECTOConsoleStart/Program.cs
#	VECTO/VECTO.vbproj
#	VECTO3GUI2020/Util/XML/XMLNamespaces.cs
#	VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
#	VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
#	VectoCommon/VectoCommon/Models/PowertrainPosition.cs
#	VectoConsole/Program.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1575-refactor-testpowertrain to develop

* commit 'bdca670d':
  VehicleContainer: Added some compiler directives for hiding debug output.
  HybridStrategy, SerialHybridStrategy: Finally updated to TestPowertrain.UpdateComponents
  CopyFrom: Removed field which are set manually.
  Pulled up Member "RequestAfterGearshift" to avoid having to cast to ATGearbox
  HybridController: Corrected compiler warning (override of InitStartGear)
  PowertrainBuilder reverted back to 2 serial hybrid strategies
  HybridStrategy and SerialHybridStrategy reverted once again
  HybridStrategy: Minor changes
  IUpdateable and minor changes to avoid compilation warnings
  HybridStrategy: Refactored to IUpdateable
  SerialHybridStrategy finished refactoring to IUpdateable
  SerialHybridStrategy and SerialHybridStrategyAT: Refactored to IUpdateable
  Brakes: Implemented IUpdateable
  SerialHybridStrategy: Partially refactored to UpdateFrom
  HybridStrategy: Made Battery optional
  HybridStrategyAT: Partially refactored to UpdateFrom
  HybridStrategy: Partially Refactored to UpdateFrom
  SimpleCharger: made ChargingPower private
  Many Changes: Squashed all IUpdateable Changes together to merge it with develop branch again.

Pull request #248: VECTO-1615 and VECTO-1616: Braking ended in vehiclespeed being slightly below TargetSpeed. Added Tolerance of 0.1 km/h

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/VECTO-1615 to develop

* commit '2fc7ad47':
  VECTO-1615 and VECTO-1616: Braking ended in vehiclespeed being slightly below TargetSpeed. Added Tolerance of 0.1 km/h

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/VECTO-1621-responsive-on-frequent-log-messages to develop

* commit '1c4ca10f':
  Added Timer for LogMessages to make GUI more responsive.

VECTO-1615 and VECTO-1616: Braking ended in vehiclespeed being slightly below TargetSpeed. Added Tolerance of 0.1 km/h

(cherry picked from commit 61157f84)

implement reader classes for all vehicle types (HEV-P, HEV-S, PEV) so that reading Primary vehicle VIF basically works (bindings)

modify xml schema CIF exempted bus: use xml group
adapt sample xml files