Merge pull request #2 from szimmers/sap130830d_route_resolver_for_endpoints

Sap130830d route resolver for endpoints
Merge pull request #3 from szimmers/sap130903_nav_improve

Sap130903 nav improve
Merge remote-tracking branch 'origin/master' into sap130903_styling