changed uid to username
Merge branch 'dev' of github.com:bellcom/os2dagsorden into ballerup
Merge branch 'ballerup' of github.com:bellcom/os2dagsorden into ballerup