Initial commit for username_search branch. Added unit test to user model
Added username to list of search criteria
Merge branch 'master' into username_search
Merge branch 'master' into username_search