Merge branch 'master' into settings_and_mandrill_email

circle.yml

project.clj

...rontend_client/app/admin/datasets/datasets.controllers.js

...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

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

resources/frontend_client/app/card/card.charting.js

resources/frontend_client/app/card/card.controllers.js

resources/frontend_client/app/controllers.js

resources/frontend_client/app/css/query_builder.css

resources/frontend_client/app/react/query_builder.js

resources/frontend_client/app/services.js

resources/frontend_client/index.html

resources/log4j.properties

src/metabase/api/org.clj

src/metabase/db.clj

src/metabase/driver/postgres/sync.clj

src/metabase/middleware/log_api_call.clj

test/metabase/http_client.clj