- fixed some bugs in User model
- moved some functions from UserDataHelper to UserGroup model
- moved som things around for the UserData model