Merge "Introduced UserController for multi-user functionality"