Merge branch 'develop' of...

VECTO/GUI/BatteryForm.vb

VECTO/GUI/VehicleForm.Designer.vb

VECTO/GUI/VehicleForm.resx

VECTO/GUI/VehicleForm.vb

VECTO/Input Files/Engine.vb

VECTO/Input Files/Gearbox.vb

VECTO/Input Files/MockComponents.vb

VECTO/Input Files/Vehicle.vb

VECTO/VECTO.vbproj

...ntation/JobEdit/Vehicle/Components/ComponentsViewModel.cs

...ge/Implementation/InterimStageBusVehicleViewModel_v2_8.cs

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs

...VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs

...oCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs

VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

...tion/DataProvider/XMLDeclarationComponentsDataProvider.cs

...ration/Reader/Impl/XMLDeclarationMultistageInputReader.cs

...taProvider/XMLEngineeringVehicleComponentsDataProvider.cs