add bus station
Merge branch 'fix_bus_station'

Conflicts:
	cpp/bus_station.cpp