Merge branch 'master' into stabilize-integration-tests

OSX/Metabase.xcodeproj/project.pbxproj

OSX/Metabase/Backend/MetabaseTask.m

OSX/Metabase/Backend/ResetPasswordTask.m

bin/osx-setup

circle.yml

docs/administration-guide/01-managing-databases.md

docs/administration-guide/images/large-db-toggle.png

docs/administration-guide/images/scanning-options.png

docs/developers-guide-osx.md

docs/users-guide/03-basic-exploration.md

docs/users-guide/04-asking-questions.md

docs/users-guide/05-visualizing-results.md

docs/users-guide/14-x-rays.md

docs/users-guide/images/binning.png

docs/users-guide/images/histogram.png

docs/users-guide/images/metric-action-menu.png

docs/users-guide/images/metric-drill-through.png

docs/users-guide/images/metrics-list.png

docs/users-guide/images/new-question-all-options.png

docs/users-guide/images/segment-actions.png