Admin and Active flags are shown in Permissions column
Showing permissions in during user merge
Copy paste mistakes
Text muted for chevron-up on Merge Users form

Similar to User List approach, as controlled in `main/templates/macro/utils.html`
Minor changes to avoid merge conflicts
Merge pull request #102 from mdxs/patch-2

Text muted for chevron-up on Merge Users form
Merged with gae-init