forgot a return total
Merge branch 'develop' into vdev
pushing before code cleanup
Fixes for assignmentSweep3 and fix for doTwoOpt
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop