Merge branch 'master' into AbfahrtsView

Conflicts:
	Vienna Traffic Monitor/Filter/FilterCollection.cs
	Vienna Traffic Monitor/View/Abfahrten.xaml
Merge branch 'AbfahrtsView' of https://github.com/CodefoundryDE/ViennaTrafficMonitor into AbfahrtsView

Conflicts:
	Vienna Traffic Monitor/Filter/FilterCollection.cs