modified user table
Merge branch 'DBwork'