Fixes for assignmentSweep3 and fix for doTwoOpt
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop
reorginizing pick delivery code
deleting old files