adapt to changes in how SetupAssignments are loaded from XML
change default PerEdgeFeatureColorGenerator
Merge remote-tracking branch 'origin/multiviewtracker' into multiviewtracker