modify vehicleDAO
Merge origin/master