test
Urhm lets ope this doesn't kill everything
test
Merge remote-tracking branch 'origin/master' into DBconnect

aaaaahhh this shit...

Conflicts:
	Code/NijnCoach/NijnCoach/Database/Model2.Designer.cs
	Code/NijnCoach/NijnCoach/Database/Model2.edmx