users_lookup API
user API
Merge branch 'feature/users' into develop