Use numItineraries in GenericAStar
Merge remote-tracking branch 'upstream/master' into numitineraries

Conflicts:
	src/main/java/org/opentripplanner/profile/ProfileRouter.java
	src/main/java/org/opentripplanner/routing/algorithm/GenericAStar.java
	src/test/java/org/opentripplanner/GtfsTest.java
	src/test/java/org/opentripplanner/api/resource/TestRequest.java
Adapt to changes in GraphVisualizer
Remove unnecessary saving and restoring of numItineraries
Merge pull request #1431 from hannesj/numitineraries

Use numItineraries in GenericAStar