Merge branch 'master' into serialize-cards-as-hashes

...nd/src/admin/datamodel/components/database/ColumnItem.jsx

frontend/src/admin/people/components/UserRoleSelect.jsx

frontend/src/card/card.charting.js

frontend/src/card/card.controllers.js

frontend/src/card/card.module.js

frontend/src/card/card.services.js

frontend/src/components/ExplicitSize.jsx

frontend/src/components/dashboard/dashboard.css

frontend/src/css/query_builder.css

frontend/src/dashboard/components/DashCard.jsx

frontend/src/dashboard/components/Dashboard.jsx

frontend/src/dashboard/components/DashboardGrid.jsx

frontend/src/dashboard/components/cards/ChartCard.jsx

frontend/src/dashboard/components/cards/ScalarCard.jsx

frontend/src/dashboard/dashboard.controllers.js

frontend/src/dashboard/dashboard.module.js

frontend/src/lib/core.js

frontend/src/lib/schema_metadata.js

frontend/src/lib/visualization_settings.js

frontend/src/query_builder/DataReferenceMain.jsx