userid -> email
Merge branch 'master' of https://github.com/persn/Team13Systemering2013HiST.git