Added a new user page, and added group name to user index
Resolving conflicts