Merge branch 'master' of gitlab.codefoundry.de:fhrosenheim/GUI

Conflicts:
	Vienna Traffic Monitor/Properties/Settings.Designer.cs
Merge branch 'master' of https://github.com/CodefoundryDE/ViennaTrafficMonitor

Conflicts:
	Vienna Traffic Monitor/Properties/Settings.Designer.cs