testing intraswap... sill missing adjusting dumps
integrated vicky's code into tabu search. Cleaned up some formating in vehicle.
 forgotten file
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop

Conflicts:
	baseTrash/vehicle.cpp