Removed dangling bracket
Query using correct id
Move ResourceBase into api package
Add update merge helper
Add route to user management API
Optimize imports
Add Clients helper
Add enabled field to Client