merge

.editorconfig

Gulpfile.js

README.md

bower.json

doc/intro.md

project.clj

...rontend_client/app/admin/settings/settings.controllers.js

...ces/frontend_client/app/admin/settings/settings.module.js

resources/frontend_client/app/app.js

resources/frontend_client/app/auth/auth.controllers.js

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

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

resources/frontend_client/app/controllers.js

resources/frontend_client/app/css/external/datepicker.css

resources/frontend_client/app/css/query_builder.css

resources/frontend_client/app/js/google_maps.js

...ntend_client/app/query_builder/database_selector.react.js

...es/frontend_client/app/query_builder/date_filter.react.js

.../frontend_client/app/query_builder/filter_widget.react.js

resources/frontend_client/app/query_builder/header.react.js