Merge branch 'master' into userService
Merge branch 'master' into userService
Added validation
Merge branch 'userService'