Modify user model
Merge branch 'TH-1' into dev1.0