Merge branch 'master' into use_annotations

.dir-locals.el

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

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

...tend_client/app/admin/datasets/partials/dataset_edit.html

...tend_client/app/admin/datasets/partials/dataset_list.html

...tend_client/app/admin/datasets/partials/field_detail.html

...nt/app/admin/emailreport/partials/emailreport_detail.html

...ient/app/admin/emailreport/partials/emailreport_list.html

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

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

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

...client/app/admin/query/partials/query_detail_results.html

.../frontend_client/app/admin/query/partials/query_list.html

...s/frontend_client/app/admin/query/partials/query_run.html

resources/frontend_client/app/app.js

resources/frontend_client/app/components/buttons/buttons.css

resources/frontend_client/app/controllers.js

resources/frontend_client/app/css/admin.css

resources/frontend_client/app/css/core/base.css

resources/frontend_client/app/css/core/breakpoints.css