Merge remote-tracking branch 'origin' into fix_safari_activity_initials

.eslintrc

frontend/app/activity/activity.services.js

frontend/app/admin/databases/databases.controllers.js

frontend/app/admin/databases/databases.module.js

...end/app/admin/metadata/components/MetadataEditor.react.js

...tend/app/admin/metadata/components/MetadataField.react.js

...end/app/admin/metadata/components/MetadataHeader.react.js

...end/app/admin/metadata/components/MetadataSchema.react.js

...tend/app/admin/metadata/components/MetadataTable.react.js

.../app/admin/metadata/components/MetadataTableList.react.js

frontend/app/admin/metadata/metadata.controllers.js

frontend/app/admin/metadata/metadata.module.js

frontend/app/admin/people/actions.js

frontend/app/admin/people/components/AdminPeople.react.js

frontend/app/admin/people/components/EditUserForm.react.js

...nd/app/admin/people/components/UserActionsSelect.react.js

frontend/app/admin/people/components/UserRoleSelect.react.js

frontend/app/admin/people/containers/AdminPeopleApp.react.js

frontend/app/admin/people/people.controllers.js

frontend/app/admin/people/people.module.js