userService-findByUsername
Merge origin/master