Merge branch 'master' into skinny_time_bars_fix

.dir-locals.el

.gitmodules

README.md

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

bin/release/aws-eb/.ebextensions/extend_timeout.config

...se/aws-eb/.ebextensions/metabase_config/metabase-setup.sh

...aws-eb/.ebextensions/metabase_config/nginx/default_server

...eb/.ebextensions/metabase_config/nginx/log_x_real_ip.conf

...eb/.ebextensions/metabase_config/papertrail/log_files.yml

...eb/.ebextensions/metabase_config/papertrail/remote_syslog

bin/start

circle.yml

docs/administration-guide/02-setting-up-email.md

docs/developers-guide.md

...tend/src/admin/databases/components/DatabaseEditForms.jsx

frontend/src/admin/databases/components/DatabaseList.jsx

frontend/src/admin/databases/databases.controllers.js

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

frontend/src/card/card.controllers.js

frontend/src/card/card.util.js