EditVehicle logic changed

Edit vehicle did not work proparly
Merge remote-tracking branch 'origin/dev-deam'