Merge remote-tracking branch 'mainOTP/master' into FindStationAtBuildGraph
Merge remote-tracking branch 'mainOTP/master' into FindStationAtBuildGraph
bug fix in #947, removed unused StreetTransitLink
Merge branch 'master' into FindStationAtBuildGraph
Merge remote-tracking branch 'mainOTP/master'
Added more data to serialization when tov or formv are nulls
anthoer fix for the pruneFloatingIslands class
Formatting fixups.
Fix maven build, since tomcat 6.0.35 is apparently not available for download
Add bannedAgencies parameter. Same as bannedRoutes, but will disable entire agency.
Merge pull request #962 from gcamp/master-disable-agencies

Add bannedAgencies parameter. Same as bannedRoutes, but will disable entire agency.
Merge pull request #961 from gcamp/master-opt

Fix maven build, since tomcat 6.0.35 is apparently not available for download
Merge remote-tracking branch 'mainOTP/master'
fixed bug in the stopAlerts the stop id is now according to the database
Bike-rental: allow for multiple networks in tags.

Also add support for "operator" tag on top of "network".
Add more check to prevent out-of-bounds exception.

Exception occurs when the start node of the trip is a bike-rental station node, and you plan a bike rental trip.
Merge remote-tracking branch 'mainOTP/master'
Merge remote-tracking branch 'upstream/master'
Update the API to include computation time in responses.
Rebuild thrift structures and write the computation time to the responses.