add user model
merge into master