User class update
Merge branch 'server'