Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-83-adapt-engine-only-simulation-for

Merge pull request #44 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-90-formatting-errors-in-test-driving to develop

* commit '5a8a85d7':
  revert changes in cycle testfiles, make tests run again

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VECTO-83-adapt-engine-only-simulation-for

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs

Merge pull request #43 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-87-use-uniform-code-formatting to develop

* commit 'c4eca885':
  modified code formatting settings (spaces inside array initializer)
  reformatting code using resharper
  applied ReSharper code formatting to VectoCore
  applied ReSharper code formatting with new settings on Test Project
  adding ReSharper config-file for c# code formatting

Merge pull request #42 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-86-improve-simulation-performance to develop

* commit '78e936a7':
  new search method to look up auxiliary power demand
  identify performance bottlenecks

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VECTO-86-improve-simulation-performance

Merge pull request #41 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-79-add-jobcontainer-or-similar to develop

* commit '210d04ef':
  changed order of absTime increase
  Container for Jobs (Simulators)
  updated sequence diagramms
  Updated Sequence diagrams of Request and Simulation
  Implement Test for Driving Cycle Job

* develop:
  throw exception if no power demand can be found
  Adapting Auxiliary to work with Units class
  BugFix: Limit Engine Full Load Power / Full Drag Power
  adding simulation components to vehicle container via base class VectoSimulationcomponent adding auxiliaries component

Conflicts:
	VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
	VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
	VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
	VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs
	VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
	VectoCore/VectoCore.csproj

Merge pull request #40 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-77-vectosimulationcomponent-for-auxiliaries to develop

* commit '5c885dd3':
  throw exception if no power demand can be found

Merge pull request #39 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-77-vectosimulationcomponent-for-auxiliaries to develop

* commit '3fe6446e':
  Adapting Auxiliary to work with Units class
  BugFix: Limit Engine Full Load Power / Full Drag Power
  adding simulation components to vehicle container via base class VectoSimulationcomponent adding auxiliaries component

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-77-vectosimulationcomponent-for-auxiliaries

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/VectoCoreTest.csproj

* develop:

adding auxiliaries component

Merge pull request #38 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-80-convert-all-input-data-to-si-units to develop

* commit '1caafa92':
  Added tests
  Corrected Error in SI Unit Division
  SI Units ... most test work, but again fuel consumption fails in some cases
  Changed interfaces to strong typed physical units. Made Project compileable again.
  Tests for SI Units
  finally got EngineOnlyDrivingTest to work again. (remark: DelauneyTriangulation is _really_ very sensitive to scaled values).
  Added some Code Contract statements for error checking. Corrected some tests
  Finished Test Correction for SI Units
  Added SI Units and Conversion to Basic SI Units. Added Code Contracts
  fuelconsumption map changed to si units