begynt på emailform
Merge remote-tracking branch 'origin/Programering' into Programering

Conflicts:
	nbproject/private/private.properties