added DBUser, deleted user.phonenumber
Merge remote-tracking branch 'origin/jonathanTest'