Consolidate stop names
Merge branch 'master' of github.com:BerlinDreiStopp/iOS