fix #847
Merge commit 'd689604a9a0f31278dd9a0ae3c712751044b0d48' into stable
Revert "fix #847"

This reverts commit 374560d2ba8d86724ed6353e95559dac4817cf62.
Merge branch 'master' into stable
Merge branch 'master' into stable
use default USGS servers instead of 2010 hack
Merge commit '6d8a9b78b66efe2e800971ba75c58c496e98cecd' into stable
replace entire leaflet client dir with version from master
include trip block ID in API /plan response (needed for #1178)
check permissions of edges leading out of "corner" vertice. fixes #1105
accommodate tests that use a null routing request
add 'stopData' method to TransitIndex API for retrieving data for single stop given id (needed to fully support #1162)
use newer