fixed conditions based on type, fixed graph colors
Starting to add some tools and code for Tabu search
Merge branch 'vdev' into develop
Merge branch 'develop' into sdev