add Validation to User Model
Merge remote-tracking branch 'origin/master'