added shipvia fields to workspace
added ship vias fields
resolved conflicts
Merge pull request #2 from lynnaloo/logistify

Logistify