Merge branch 'peterbranch'

Conflicts:
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml
	VITAKundekartotek/VITAKundekartotek/MainWindow.xaml.cs