Removed Auth and base UserController, moved stuff to admin/UserController.
Merged conflict.