ludd
Merge branch 'master' of https://github.com/JoelPennegard/sysa14affairs

Conflicts:
	AffairsSystem/AffairsSystem/DAL.cs
ludde
ludde