In the process of reorganizing client architecture
Merge remote-tracking branch 'origin/master'
Fixed loading busStops from file