Merge remote-tracking branch 'origin/master'

Conflicts:
	HovedOpgave/Webservice/App_Data/SchoolDB.mdf
	HovedOpgave/Webservice/App_Data/SchoolDB_log.ldf
	HovedOpgave/Webservice/Service1.svc.cs
	HovedOpgave/Webservice/bin/Webservice.dll
	HovedOpgave/Webservice/bin/Webservice.pdb
	HovedOpgave/Webservice/obj/Debug/Webservice.csproj.FileListAbsolute.txt
	HovedOpgave/Webservice/obj/Debug/Webservice.dll