User list display change

If you ever modify sentry to use `username` as the login attribute, the user list will display the username in both `Email` and `Username` table columns.
Merge branch '1.2'