Merge branch 'master' of github.com:metabase/metabase into heroku_deploy

.eslintrc

frontend/src/admin/metadata/components/MetadataEditor.jsx

frontend/src/admin/metadata/components/MetadataField.jsx

frontend/src/admin/metadata/components/MetadataHeader.jsx

frontend/src/admin/metadata/components/MetadataSchema.jsx

frontend/src/admin/metadata/components/MetadataTable.jsx

frontend/src/admin/metadata/components/MetadataTableList.jsx

frontend/src/admin/metadata/metadata.controllers.js

frontend/src/admin/people/components/AdminPeople.jsx

frontend/src/admin/people/components/EditUserForm.jsx

frontend/src/admin/people/components/UserActionsSelect.jsx

frontend/src/admin/people/components/UserRoleSelect.jsx

frontend/src/admin/people/containers/AdminPeopleApp.jsx

frontend/src/admin/people/people.controllers.js

frontend/src/admin/settings/components/SettingsEditor.jsx

frontend/src/admin/settings/components/SettingsHeader.jsx

frontend/src/admin/settings/components/SettingsSetting.jsx

frontend/src/admin/settings/settings.controllers.js

frontend/src/card/card.controllers.js

frontend/src/card/components/AccordianItem.jsx