Merge branch 'user-search' into 'master'

User-search

doc/api/users.md

@@ -51,6 +51,10 @@ GET /users
 ]
 ```
 
+You can search for a users by email or username with:
+`/users?search=John`
+
+Also see `def search query` in `app/models/user.rb`.
 
 ## Single user