Associationg update
Merge branch 'master' of https://github.com/Hatsen/Hovedopave

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