Merge branch 'master' of github.com:metabase/metabase into pulse-fixes-round-3

Dockerfile

OSX/Metabase/Metabase-Info.plist

OSX/Metabase/UI/LoadingView.m

bin/aws-eb-docker/.ebextensions/01_metabase.config

...eb-docker/.ebextensions/metabase_config/metabase-setup.sh

...docker/.ebextensions/metabase_config/nginx/default_server

...er/.ebextensions/metabase_config/nginx/log_x_real_ip.conf

...er/.ebextensions/metabase_config/papertrail/log_files.yml

...er/.ebextensions/metabase_config/papertrail/remote_syslog

bin/aws-eb-docker/Dockerrun.aws.json.template

bin/aws-eb-docker/build-eb-version.sh

bin/aws-eb-docker/deploy-eb-version.sh

bin/aws-eb-docker/functions

bin/docker/Dockerfile

bin/docker/build_image.sh

bin/docker/run_metabase.sh

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

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

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

frontend/src/components/Popover.jsx