implemented search by username/email
Merge remote-tracking branch 'remotes/origin/master'