MaterialMgr
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF

Conflicts:
	SealingSchoolWPF/Data/MaterialMgr.cs
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF
Vorbereitung für MaterialGroup
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF

Conflicts:
	SealingSchoolWPF/App.config
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF

Conflicts:
	SealingSchoolWPF/App.config
BoatTyp hinzugefügt
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF

Conflicts:
	SealingSchoolWPF/Resources/Language/Resource.Designer.cs
	SealingSchoolWPF/Resources/Language/Resource.de-DE.resx
	SealingSchoolWPF/Resources/Language/Resource.en-US.resx
	SealingSchoolWPF/Resources/Language/Resource.resx