Merge branch 'master' into retarget_readme

circle.yml

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

resources/frontend_client/app/card/partials/card_detail.html

...rces/frontend_client/app/operator/operator.controllers.js

...ntend_client/app/operator/partials/specialist_detail.html

...ontend_client/app/superadmin/index/partials/settings.html

resources/frontend_client/index.html

src/metabase/api/card.clj

src/metabase/api/common.clj

src/metabase/api/dash.clj

src/metabase/api/emailreport.clj

src/metabase/api/meta/dataset.clj

src/metabase/api/meta/db.clj

src/metabase/api/meta/table.clj

src/metabase/api/query.clj

src/metabase/api/tiles.clj

src/metabase/db.clj

src/metabase/driver.clj

src/metabase/driver/generic_sql/query_processor.clj

src/metabase/driver/generic_sql/query_processor/annotate.clj