fixed merge to handle coincident stops
misc fixes for feed export
created generic conveyal logo for login
merge
reverting generic logo
allow editing of agenceis/route types + map for lat/lng select
Merge branch 'master' into setravi