Fixes bug in User class.
Merge branch 'master' of github.com:Assios/fellesprosjekt