Conflicts:
	VECTO/VECTO.vbproj
	VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd

Merge pull request #419 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-474-update-driving-cycles to develop

* commit 'f91fdaec':
  fix in cycle
  new RD cycle

Merge pull request #418 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-499-change-decision-if-ems-is-used to develop

* commit '8f0280c4':
  change decision whether EMS is simulated depending on declared engine power
  elevate testdata to latest json file version (engine v4)

Merge pull request #417 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-501-implement-vehicle-engine-idle-speed to develop

* commit '0846e86f':
  adding vehicle indling speed input parameter

Merge pull request #416 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-502-default-airdrag-values to develop

* commit '78ff4a1d':
  adding testcases for using standard airdrag values

Merge pull request #415 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-500-implement-xml-output to develop

* commit '7eea88d0':
  adapt formatting of FC output in xml reports
  implement customer report, generate report only once
  cleanup coc xsd
  update COC XSD
  make testcases work
  implementing XML Report generation. fetching all required input data, make airdragdata a separate component
  removing PDF report
  adding schema proposal for xml output

implementing XML Report generation. fetching all required input data, make airdragdata a separate component

Merge pull request #414 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-494-implementation-of-fuel-types to develop

* commit '760eeca7':
  adding testcase for comparing results of different fuel types
  implement CO2 values per fuel type

Merge pull request #413 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-497-extrapolation-of-cross-wind-correction to develop

* commit '044f2b88':
  change max speed for 'no-correction' cross-wind correction option

This reverts commit aab1fbb7.