q
Merge branch 'peterbranch'

Conflicts:
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml.cs
Merge branch 'master' into alexbranch

Conflicts:
	VITAKundekartotek/Controller/LetterController.cs
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml.cs
l
a