merge

...nd_client/app/admin/databases/partials/database_edit.html

...d_client/app/admin/people/partials/modal_create_user.html

...client/app/admin/people/partials/modal_edit_password.html

...end_client/app/admin/people/partials/modal_edit_user.html

...ces/frontend_client/app/admin/people/partials/people.html

...frontend_client/app/admin/people/partials/people_add.html

.../frontend_client/app/admin/people/partials/user_edit.html

..._client/app/admin/people/partials/user_password_edit.html

...es/frontend_client/app/admin/people/people.controllers.js

...ces/frontend_client/app/admin/people/people.directives.js

resources/frontend_client/app/admin/people/people.module.js

src/metabase/api/common.clj