id shown in low level graphs
removing unneeded include
added a timedistance condition, and fixed intraswp
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop
Adding new FeasableSolLoop code to avoid recursion.
Merge branch 'sdev' into develop