Änderungen in Optionen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Verplaner/OptionenWindow.xaml.cs