Revert "jobbet med email i tabell"

This reverts commit a01ff973487a91443321b54ca72a8c22fbad89f1.
Jobbet med Email
Revert "Revert "jobbet med email i tabell""

This reverts commit 2cac12ebe4fc221eb6743ee3b3f051c8ba56921f.

Conflicts:
	nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
	nbproject/project.properties
	src/java/no/uia/slit/auth/AuthUser.java
Jobbet med Email