update
Merge remote-tracking branch 'origin/master'

Conflicts:
	HovedOpgave/Webservice/bin/Webservice.dll
	HovedOpgave/Webservice/bin/Webservice.pdb

	HovedOpgave/Webservice/obj/Debug/Webservice.csprojResolveAssemblyReference.cache
	HovedOpgave/Webservice/obj/Debug/Webservice.dll