Refactorings of OsmSharpRoute working towards issue #14.
Fixed merge conflicts.