docks and bikes on map
Merge branch 'all_stations_on_map'
merged changes with station icons