Merge branch 'IVT/develop' into develop

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs

Documentation/User Manual/4-command-line-arguments/cmd.md

@@ -2,7 +2,7 @@
 
 ![](pics/cmd3.png)
 
-The Vecto 3.x commandline tool can be used to start simulations from the command line and  runs without  graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel.
+The VECTO 3.x commandline tool can be used to start simulations from the command line and  runs without  graphical user interface. If multiple job-files are specified or a job-file contains multiple simulation runs (i.e., multiple cycles and/or loadings) these simulations are executed in parallel.
 
 ### General Notes
 

Documentation/User Manual/5-input-and-output-files/CSV.md

 ## CSV
-Many data files in Vecto use CSV (Comma Separated Values) as common file format. They consist of a header which defines the columns and data entries which are separated by a comma (",").
+Many data files in VECTO use CSV (Comma Separated Values) as common file format. They consist of a header which defines the columns and data entries which are separated by a comma (",").
 
-In Vecto 3 the order of the columns is arbitrary if the column header matches the header definitions described in this user manual. If the column header does not match, a warning is written to the log file and the columns are parsed in the sequence as described in this manual as a fall-back.
+In VECTO 3 the order of the columns is arbitrary if the column header matches the header definitions described in this user manual. If the column header does not match, a warning is written to the log file and the columns are parsed in the sequence as described in this manual as a fall-back.
 
 
 ### Definition###
@@ -9,17 +9,17 @@ In Vecto 3 the order of the columns is arbitrary if the column header matches th
 
 |                         |                                                                                                                                                                                                                                                                                                                                                                                                    |
 | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Header:**             | Vecto CSV needs exactly one header line with the definition of the columns at the beginning of the file. <br>Columns can be surrounded with "\<" and "\>" to mark them as identifiers (which makes them position independent). In Vecto 3.x every column is seen as identifier, regardless of "\<\>". <br>Columns may be succeded with unit information (enclosed in "[" and "]") for documentation purposes. |
+| **Header:**             | VECTO CSV needs exactly one header line with the definition of the columns at the beginning of the file. <br>Columns can be surrounded with "\<" and "\>" to mark them as identifiers (which makes them position independent). In VECTO 3.x every column is seen as identifier, regardless of "\<\>". <br>Columns may be succeded with unit information (enclosed in "[" and "]") for documentation purposes. |
 | **Column Separator:**   | **,** (Comma. Separates the columns of a data line.)                                                                                                                                                                                                                                                                                                                                               |
 | **Decimal-Mark:**       | **.** (Dot. Splits numbers into integer part and decimal part.)                                                                                                                                                                                                                                                                                                                                    |
-| **Thousand-Separator:** | Vecto CSV does not allow a thousand-separator.                                                                                                                                                                                                                                                                                                                                                     |
+| **Thousand-Separator:** | VECTO CSV does not allow a thousand-separator.                                                                                                                                                                                                                                                                                                                                                     |
 | **Comments:**           | **#** (Number sign. Declares text coming afterwards in the current line as comment.)                                                                                                                                                                                                                                                                                                               |
 | **Whitespace:**         | Whitespaces between columns will be stripped away. Therefore it is possible to align the columns for better readability, if desired.                                                                                                                                                                                                                                                               |
 
 
 **Note:** All column headers are case insensitive.
 
-**Note:** Unit information in the column header (enclosed in "[" and "]") are only information for the user. Vecto does **not** read the unit string nor convert between units. The values are expected to be in the units as specified in the user manual. 
+**Note:** Unit information in the column header (enclosed in "[" and "]") are only information for the user. VECTO does **not** read the unit string nor convert between units. The values are expected to be in the units as specified in the user manual. 
 
 
 Following files use the csv:

Documentation/User Manual/5-input-and-output-files/JSON.md

 ## JSON
-Configuration and component files in Vecto use [JSON](http://en.wikipedia.org/wiki/JSON) ![](pics/external-icon%2012x12.png) as common file format.
+Configuration and component files in VECTO use [JSON](http://en.wikipedia.org/wiki/JSON) ![](pics/external-icon%2012x12.png) as common file format.
 
 Following files use JSON:
 

Documentation/User Manual/5-input-and-output-files/VDRI.md

 ## Driving Cycles (.vdri)
 
-A Driving Cycle defines the parameters of a simulated route in Vecto. It is either time-based or distance-based and has different fields depending on the driving cycle type.
-The basic file format is [Vecto-CSV](#csv) and the file type ending is ".vdri". A Job must have at least one driving cycle (except in Declaration mode, where the driving cycles are predefined).
+A Driving Cycle defines the parameters of a simulated route in VECTO. It is either time-based or distance-based and has different fields depending on the driving cycle type.
+The basic file format is [VECTO-CSV](#csv) and the file type ending is ".vdri". A Job must have at least one driving cycle (except in Declaration mode, where the driving cycles are predefined).
 
 ### Driving Cycle Types
 - **Declaration Mode**: [Target speed, distance-based](#declaration-mode-cycles)
@@ -66,7 +66,7 @@ t [s]              , v [km/h]    , n_eng [rpm] , n_fan [rpm] , tq_left [Nm] , tq
 
 
 ### Engineering Mode: Target-Speed, Distance-Based Cycle
-This driving cycle defines the target speed over distance. Vecto tries to achieve and maintain this target speed.
+This driving cycle defines the target speed over distance. VECTO tries to achieve and maintain this target speed.
 
 Header: **s, v, stop***\[, Padd]\[, grad]\[, PTO]\[, vair\_res, vair\_beta]*
 
@@ -130,7 +130,7 @@ t [s]     v [km/h] , grad [%]    , Padd [kW]
 ### Engineering Mode: Measured-Speed With Gear, Time-Based Cycle
 
 This driving cycle defines the actual measured speed of the vehicle, the gear, and the engine speed over time.
-It overrides the shift strategy of Vecto and also directly sets the engine speed.
+It overrides the shift strategy of VECTO and also directly sets the engine speed.
 
 
 Header: **t, v, gear***\[, tc\_active, grad]\[, Padd]\[, vair\_res, vair\_beta]\[, Aux\_ID\]*
@@ -160,7 +160,7 @@ t [s]              , v [km/h]    , gear [-]    , grad [%]    , Padd [kW]
 ~~~
 
 ### Engineering Mode: Pwheel (SiCo), Time-Based
-This driving cycle defines the power measured at the wheels over time. Vecto tries to simulate the vehicle with this power requirement.
+This driving cycle defines the power measured at the wheels over time. VECTO tries to simulate the vehicle with this power requirement.
 
 Header: **t, Pwheel, gear, n***\[, Padd]*
 
@@ -187,7 +187,7 @@ t [s]              , Pwheel [kW] , gear [-]    , n [rpm]     , Padd [kW]
 
 ### Engine Only Mode: Engine Only Driving Cycle
 
-This driving cycle directly defines the engine's power or torque at the output shaft over time. Vecto adds the engine's inertia to the given power demand and simulates the engine.
+This driving cycle directly defines the engine's power or torque at the output shaft over time. VECTO adds the engine's inertia to the given power demand and simulates the engine.
 
 Header: **t, n, (Pe|Me)***\[, Padd]*
 

Documentation/User Manual/5-input-and-output-files/VECTO-VTP.md

 ## VTP-Job File
 
-File for the definition of a verification test job in vecto. A job contains everything what is needed to run a simulation. Can be created with the [Verifcation Test Job Editor](#vtp-job-editor).
+File for the definition of a verification test job in VECTO. A job contains everything what is needed to run a simulation. Can be created with the [Verification Test Job Editor](#vtp-job-editor).
 
 - File format is [JSON](#json).
 - Filetype ending is ".vecto"

Documentation/User Manual/5-input-and-output-files/VECTO.md

 ## Job File
 
-File for the definition of an job in vecto. A job contains everything what is needed to run a simulation. Can be created with the [Job Editor](#job-editor).
+File for the definition of an job in VECTO. A job contains everything what is needed to run a simulation. Can be created with the [Job Editor](#job-editor).
 
 - File format is [JSON](#json).
 - Filetype ending is ".vecto"

Documentation/User Manual/5-input-and-output-files/VEMx.md

 ## Electric Motor Max Torque File (.vemp)
 
-This file contains the electric motor's maximum drive torque and maximum recuperation torque depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+This file contains the electric motor's maximum drive torque and maximum recuperation torque depending on the motor's angular speed. The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .vemp
 - Header: **n [rpm] , T_drive [Nm] , T_recuperation [Nm]**
@@ -21,7 +21,7 @@ n [rpm] , T_drive [Nm] , T_recuperation [Nm]
 
 ## Electric Motor Drag Curve File (.vemd)
 
-This file contains the electric motor's drag torque (i.e. the eletric motor is not energized) depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+This file contains the electric motor's drag torque (i.e. the electric motor is not energized) depending on the motor's angular speed. The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .vemd
 - Header: **n [rpm] , T_drag [Nm]**
@@ -38,7 +38,7 @@ n [rpm] , T_drag [Nm]
 
 ## Electric Motor Power Map (.vemo)
 
-This file is used to interpolate the electric power required for a certain mechanical power at the eletric motor's shaft.  The file uses the [VECTO CSV format](#csv).
+This file is used to interpolate the electric power required for a certain mechanical power at the electric motor's shaft.  The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .vemo
 - Header: **n [rpm] , T [Nm] , P_el [kW]**

Documentation/User Manual/5-input-and-output-files/VENG.md

 ## Engine File (.veng)
 
-File for the definition of an engine in Vecto. Can be created with the [Engine Editor](#engine-editor).
+File for the definition of an engine in VECTO. Can be created with the [Engine Editor](#engine-editor).
 
 - File format is [JSON](#json).
 - Filetype ending is ".veng"

Documentation/User Manual/5-input-and-output-files/VGBX.md

 ## Gearbox File (.vgbx)
 
-File for the definition of a gearbox in Vecto. Can be created with the [Gearbox Editor](#gearbox-editor).
+File for the definition of a gearbox in VECTO. Can be created with the [Gearbox Editor](#gearbox-editor).
 
 - File format is [JSON](#json).
 - Filetype ending is ".vgbx"

Documentation/User Manual/5-input-and-output-files/VIEPCx.md

 ## IEPC Max Torque File (.viepcp)
 
-This file contains the IEPC's maximum drive torque and maximum recuperation torque depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+This file contains the IEPC's maximum drive torque and maximum recuperation torque depending on the motor's angular speed. The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .viepcp
 - Header: **n_out [rpm] , T_drive_out [Nm] , T_recuperation_out [Nm]**
@@ -27,7 +27,7 @@ n_out   , T_drive_out , T_recuperation_out
 
 ## IEPC Drag Curve File (.viepcd)
 
-This file contains the IEPC's drag torque (i.e. the eletric motor is not energized) depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+This file contains the IEPC's drag torque (i.e. the electric motor is not energized) depending on the motor's angular speed. The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .viepcd
 - Header: **n_out [rpm] , T_drag_out [Nm]**

Documentation/User Manual/5-input-and-output-files/VPTOC.md

 ## PTO Cycle (.vptoc)
 
-The PTO cycle defines the power demands during standing still and doing a pto operation. This can only be used in [Engineering Mode](#engineering-mode) when a pto transmission is defined. It can be set in the [Vehicle-Editor](#vehicle-editor-pto-tab). The basic file format is [Vecto-CSV](#csv) and the file type ending is ".vptoc". A PTO cycle is time-based and may have variable time steps, but it is recommended to use a resolution between 1[Hz] and 2[Hz]. Regardless of starting time, VECTO shifts it to always begin at 0[s].
+The PTO cycle defines the power demands during standing still and doing a pto operation. This can only be used in [Engineering Mode](#engineering-mode) when a pto transmission is defined. It can be set in the [Vehicle-Editor](#vehicle-editor-pto-tab). The basic file format is [VECTO-CSV](#csv) and the file type ending is ".vptoc". A PTO cycle is time-based and may have variable time steps, but it is recommended to use a resolution between 1[Hz] and 2[Hz]. Regardless of starting time, VECTO shifts it to always begin at 0[s].
 
 Header: **\<t>, \<Engine speed>, \<PTO Torque>**
 

Documentation/User Manual/5-input-and-output-files/VPTOI.md

@@ -2,7 +2,7 @@
 
 The pto idle consumption map defines the speed-dependent power demand when the pto cycle is not active. This is only be used in [Engineering Mode](#engineering-mode) when a pto transmission is defined.
 The exact demand is interpolated based on the engine speed. PTO consumer idling losses are added to engine loads during any parts of the vehicle operation except the "PTO cycle". It can be defined in the [Vehicle-File](#vehicle-file-.vveh) and set via the [Vehicle-Editor](#vehicle-editor-pto-tab).
-The basic file format is [Vecto-CSV](#csv) and the file type ending is ".vptoi".
+The basic file format is [VECTO-CSV](#csv) and the file type ending is ".vptoi".
 
 Header: **\<Engine speed>, \<PTO Torque>**
 

Documentation/User Manual/5-input-and-output-files/VVEH.md

 ## Vehicle File (.vveh)
 
-File for the definition of a vehicle in vecto. Can be created with the [Vehicle Editor](#vehicle-editor-general-tab).
+File for the definition of a vehicle in VECTO. Can be created with the [Vehicle Editor](#vehicle-editor-general-tab).
 
 - File format is [JSON](#json).
 - Filetype ending is ".vveh"