Commit fra Asger (Måske dårlig!)
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Code/DBcon.cs