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
Merge remote-tracking branch 'mainOTP/master'
fixed bug in the stopAlerts the stop id is now according to the database
Merge remote-tracking branch 'mainOTP/master'
Merge remote-tracking branch 'mainOTP/master'
Merge remote-tracking branch 'mainOTP/master'
Merge remote-tracking branch 'mainOTP/master'
Format some of the remaining weight heuristics. Add a factory for BiDi.
Merge branch 'master' of git://github.com/openplans/OpenTripPlanner into master-opt
Merge remote-tracking branch 'mainOTP/master'
comments and formatting
Merge branch 'master' of ssh://github.com/openplans/OpenTripPlanner
KV8updater: Switch from zeromq JNI to jeromq
Merge remote-tracking branch 'origin/master' into zmqUpdateStreamer

Conflicts:
	opentripplanner-updater/src/main/java/org/opentripplanner/updater/stoptime/KV8ZMQUpdateStreamer.java