getting latest
Merge branch 'master' of https://github.com/FHFlensburg/Diamondback

Conflicts:
	CourseManagement/Client/View/WndIndex.xaml.cs