Backport changes from wait_time_compression branch
Merge branch 'bugfix_preferred_routes' into backport

Conflicts:
	otp-core/src/main/java/org/opentripplanner/api/ws/DebugOutput.java
	otp-core/src/main/java/org/opentripplanner/routing/algorithm/GenericAStar.java
	otp-core/src/main/java/org/opentripplanner/routing/core/State.java
	otp-core/src/main/java/org/opentripplanner/routing/edgetype/Timetable.java
Add package org.opentripplanner.mmri with 32 tests
Apply patch for onboard depart initialization bug
Merge pull request #1338 from goabout/backport

Backport
Fix NPE caused by frequency-based trips
Simplify itinerary generator
Merge branch 'master' into mmri-rt

Conflicts:
	otp-core/src/main/java/org/opentripplanner/routing/transit_index/TransitIndexServiceImpl.java
Fix typo
Stop pretending partial trip cancellations work
Align OTP with GTFS-RT reference

Time takes precedence over delay, according to the GTFS-RT reference.
Eliminate Lombok @Delegate annotations
Do not let GTFS-RT alerts affect routing results
(Re)move files, preparations for patch unification
Unify classes Patch, AbstractPatch, and AlertPatch
Address last item of #1312 i.e. thread-safe alerts
Fix another typo
Merge branch 'master' of github.com:opentripplanner/OpenTripPlanner into mmri-rt

Conflicts:
	otp-core/src/main/java/org/opentripplanner/api/ws/PlanGenerator.java
	otp-core/src/main/java/org/opentripplanner/routing/algorithm/GenericAStar.java
	otp-core/src/main/java/org/opentripplanner/routing/edgetype/PlainStreetEdge.java
	otp-core/src/test/java/org/opentripplanner/api/ws/TestRequest.java
Fix minor things
Fix TransitIndex documentation