Added edge indicator and smoothing on the velocity vector.
Merge remote-tracking branch 'upstream/master'

Merge from upstream.
Added entry in .csproj file to include EdgeMarkers.cs.