work on getDistance for EdgeColorAmount
Merge remote-tracking branch 'origin/master'

Conflicts:
	sorter/SorterEdge.java
	vo/EdgeFeatureVector.java