Merge branch 'master' into fix_grant_revoke_admin

.gitignore

circle.yml

lint_js.sh

package.json

project.clj

...ient/app/admin/databases/partials/database_edit_pane.html

.../app/admin/databases/partials/database_master_detail.html

resources/frontend_client/app/app.js

resources/frontend_client/app/auth/partials/auth_scene.html

...es/frontend_client/app/auth/partials/forgot_password.html

resources/frontend_client/app/auth/partials/login.html

...ces/frontend_client/app/auth/partials/password_reset.html

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

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

resources/frontend_client/app/card/card.directives.js

resources/frontend_client/app/card/card.module.js

...ces/frontend_client/app/card/partials/_card_favorite.html

...rces/frontend_client/app/card/partials/_card_heading.html

...ces/frontend_client/app/card/partials/_card_settings.html

resources/frontend_client/app/card/partials/card_detail.html