Fix: triggers not created for queries.search_vector (#3634)

This reverts commit 4768fd081e.

.circleci/Dockerfile.cypress

@@ -0,0 +1,12 @@
+FROM cypress/browsers:chrome67
+
+ENV APP /usr/src/app
+WORKDIR $APP
+
+COPY package.json $APP/package.json
+RUN npm run cypress:install > /dev/null
+
+COPY cypress $APP/cypress
+COPY cypress.json $APP/cypress.json
+
+RUN ./node_modules/.bin/cypress verify

.circleci/config.yml

@@ -0,0 +1,129 @@
+version: 2.0
+
+flake8-steps: &steps
+  - checkout
+  - run: sudo pip install flake8
+  - run: ./bin/flake8_tests.sh
+jobs:
+  python-flake8-tests:
+    docker:
+      - image: circleci/python:3.7.0
+    steps: *steps
+  legacy-python-flake8-tests:
+    docker:
+      - image: circleci/python:2.7.15
+    steps: *steps
+  backend-unit-tests:
+    environment:
+      COMPOSE_FILE: .circleci/docker-compose.circle.yml
+      COMPOSE_PROJECT_NAME: redash
+    docker:
+      - image: circleci/buildpack-deps:xenial
+    steps:
+      - setup_remote_docker
+      - checkout
+      - run:
+          name: Build Docker Images
+          command: |
+            set -x
+            docker-compose build --build-arg skip_ds_deps=true
+            docker-compose up -d
+            sleep 10
+      - run:
+          name: Create Test Database
+          command: docker-compose run --rm postgres psql -h postgres -U postgres -c "create database tests;"
+      - run:
+          name: Run Tests
+          command: docker-compose run --name tests redash tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
+      - run:
+          name: Copy Test Results
+          command: |
+            mkdir -p /tmp/test-results/unit-tests
+            docker cp tests:/app/coverage.xml ./coverage.xml 
+            docker cp tests:/app/junit.xml /tmp/test-results/unit-tests/results.xml
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: coverage.xml
+  frontend-unit-tests:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run: sudo apt install python-pip
+      - run: npm install
+      - run: npm run bundle
+      - run: npm test
+  frontend-e2e-tests:
+    environment:
+      COMPOSE_FILE: .circleci/docker-compose.cypress.yml
+      COMPOSE_PROJECT_NAME: cypress
+      PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
+    docker:
+      - image: circleci/node:8
+    steps:
+      - setup_remote_docker
+      - checkout
+      - run:
+          name: Install npm dependencies
+          command: |
+            npm install
+      - run:
+          name: Setup Redash server
+          command: |
+            npm run cypress start
+            docker-compose run cypress node ./cypress/cypress.js db-seed
+      - run:
+          name: Execute Cypress tests
+          command: npm run cypress run-ci
+  build-tarball:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run: sudo apt install python-pip
+      - run: npm install
+      - run: .circleci/update_version
+      - run: npm run bundle
+      - run: npm run build
+      - run: .circleci/pack
+      - store_artifacts:
+          path: /tmp/artifacts/
+  build-docker-image:
+    docker:
+      - image: circleci/buildpack-deps:xenial
+    steps:
+      - setup_remote_docker
+      - checkout
+      - run: .circleci/update_version
+      - run: .circleci/docker_build
+workflows:
+  version: 2
+  build:
+    jobs:
+      - python-flake8-tests
+      - legacy-python-flake8-tests
+      - backend-unit-tests
+      - frontend-unit-tests
+      - frontend-e2e-tests
+      - build-tarball:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+            - frontend-e2e-tests
+          filters:
+            branches:
+              only:
+                - master
+                - /release\/.*/
+      - build-docker-image:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+            - frontend-e2e-tests
+          filters:
+            branches:
+              only:
+                - master
+                - preview-image
+                - /release\/.*/

.circleci/docker-compose.circle.yml

@@ -0,0 +1,22 @@
+version: '3'
+services:
+  redash:
+    build: ../
+    command: manage version
+    depends_on:
+      - postgres
+      - redis
+    ports:
+      - "5000:5000"
+    environment:
+      PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+  redis:
+    image: redis:3.0-alpine
+    restart: unless-stopped
+  postgres:
+    image: postgres:9.5.6-alpine
+    command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
+    restart: unless-stopped

.circleci/docker-compose.cypress.yml

@@ -0,0 +1,47 @@
+version: '3'
+services:
+  server:
+    build: ../
+    command: dev_server
+    depends_on:
+      - postgres
+      - redis
+    ports:
+      - "5000:5000"
+    environment:
+      PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+  worker:
+    build: ../
+    command: scheduler
+    depends_on:
+      - server
+    environment:
+      PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+      QUEUES: "queries,scheduled_queries,celery,schemas"
+      WORKERS_COUNT: 2
+  cypress:
+    build:
+      context: ../
+      dockerfile: .circleci/Dockerfile.cypress
+    depends_on:
+      - server
+      - worker
+    environment:
+      CYPRESS_baseUrl: "http://server:5000"
+      PERCY_TOKEN: ${PERCY_TOKEN}
+      PERCY_BRANCH: ${CIRCLE_BRANCH}
+      PERCY_COMMIT: ${CIRCLE_SHA1}
+      PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
+  redis:
+    image: redis:3.0-alpine
+    restart: unless-stopped
+  postgres:
+    image: postgres:9.5.6-alpine
+    command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
+    restart: unless-stopped

.circleci/docker_build

@@ -0,0 +1,17 @@
+#!/bin/bash
+VERSION=$(jq -r .version package.json)
+VERSION_TAG=$VERSION.b$CIRCLE_BUILD_NUM
+
+docker login -u $DOCKER_USER -p $DOCKER_PASS
+
+if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-image ]
+then
+    docker build -t redash/redash:preview -t redash/preview:$VERSION_TAG .
+    docker push redash/redash:preview
+    docker push redash/preview:$VERSION_TAG
+else
+    docker build -t redash/redash:$VERSION_TAG .
+    docker push redash/redash:$VERSION_TAG
+fi
+
+echo "Built: $VERSION_TAG"

.circleci/pack

@@ -0,0 +1,9 @@
+#!/bin/bash
+NAME=redash
+VERSION=$(jq -r .version package.json)
+FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
+FILENAME=$NAME.$FULL_VERSION.tar.gz
+
+mkdir -p /tmp/artifacts/
+
+tar -zcv -f /tmp/artifacts/$FILENAME --exclude="optipng*" --exclude=".git*" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" --exclude="node_modules" *

.circleci/update_version

@@ -0,0 +1,6 @@
+#!/bin/bash
+VERSION=$(jq -r .version package.json)
+FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
+
+sed -ri "s/^__version__ = '([A-Za-z0-9.-]*)'/__version__ = '$FULL_VERSION'/" redash/__init__.py
+sed -i "s/dev/$CIRCLE_SHA1/" client/app/version.json

.codeclimate.yml

@@ -1,22 +1,40 @@
-engines:
+version: "2"
+checks:
+  complex-logic:
+    enabled: false
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: false
+  method-count:
+    enabled: false
+  method-lines:
+    config:
+      threshold: 100
+  nested-control-flow:
+    enabled: false
+  identical-code:
+    enabled: false
+  similar-code:
+    enabled: false
+plugins:
   pep8:
     enabled: true
   eslint:
     enabled: true
-    channel: "eslint-3"
+    channel: "eslint-5"
     config:
       config: client/.eslintrc.js
     checks:
       import/no-unresolved:
         enabled: false
-ratings:
-  paths:
-  - "redash/**/*.py"
-  - "client/**/*.js"
-exclude_paths:
-- tests/**/*.py
-- migrations/**/*.py
-- old_migrations/**/*.py
-- setup/**/*
-- bin/**/*
-
+      no-multiple-empty-lines: # TODO: Enable
+        enabled: false
+exclude_patterns:
+- "tests/**/*.py"
+- "migrations/**/*.py"
+- "setup/**/*"
+- "bin/**/*"
+- "**/node_modules/"
+- "client/dist/"
+- "**/*.pyc"

.coveragerc

@@ -1,5 +1,9 @@
+[run]
+branch = True
+source = redash
+
 [report]
 omit =
     */settings.py
     */python?.?/*
-    */site-packages/nose/*
+show_missing = True

.dockerignore

@@ -1,4 +1,14 @@
 client/.tmp/
+client/dist/
 node_modules/
 .tmp/
+.venv/
+venv/
 .git/
+/.codeclimate.yml
+/.coverage
+/coverage.xml
+/.circleci/
+/.github/
+/netlify.toml
+/setup/

.github/ISSUE_TEMPLATE.md

@@ -1,24 +0,0 @@
-Welcome to Redash's GitHub repo! 👋🎉
-
-Do you need help or have a question? Checkout the Support category in our discussion forum: https://discuss.redash.io/c/support. 
-
-Got an idea for a new feature? Check if it isn't on the roadmap already: http://bit.ly/redash-roadmap and start a new discussion in the features category: https://discuss.redash.io/c/feature-requests 🌟.
-
-Found a bug? Please fill out the sections below... thank you 👍
-
-### Issue Summary
-
-A summary of the issue and the browser/OS environment in which it occurs.
-
-### Steps to Reproduce
-
-1. This is the first step
-2. This is the second step, etc.
-
-Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
-
-### Technical details:
-
-* Redash Version:
-* Browser/OS:
-* How did you install Redash:

.github/ISSUE_TEMPLATE/---bug_report.md

@@ -0,0 +1,34 @@
+---
+name: "\U0001F41B Bug report"
+about: Report reproducible software issues so we can improve
+---
+
+<!--
+
+We use GitHub only for bug reports 🐛
+
+Anything else should be posted to https://discuss.redash.io 👫
+
+🚨For support, help & questions use https://discuss.redash.io/c/support
+💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+
+**Found a security vulnerability?** Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use this PGP key.
+
+-->
+
+### Issue Summary
+
+A summary of the issue and the browser/OS environment in which it occurs.
+
+### Steps to Reproduce
+
+1. This is the first step
+2. This is the second step, etc.
+
+Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
+
+### Technical details:
+
+* Redash Version:
+* Browser/OS:
+* How did you install Redash:

.github/ISSUE_TEMPLATE/--anything_else.md

@@ -0,0 +1,17 @@
+---
+name: "\U0001F4A1Anything else"
+about: "For help, support, features & ideas - please use https://discuss.redash.io \U0001F46B "
+labels: "Support Question"
+---
+
+We use GitHub only for bug reports 🐛
+
+Anything else should be posted to https://discuss.redash.io 👫
+
+🚨For support, help & questions use https://discuss.redash.io/c/support
+💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+
+Alternatively, check out these resources below. Thanks! 😁.
+
+- [Forum](https://disucss.redash.io)
+- [Knowledge Base](https://redash.io/help)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+## What type of PR is this? (check all applicable)
+<!-- Please leave only what's applicable -->
+
+- [ ] Refactor
+- [ ] Feature
+- [ ] Bug Fix
+- [ ] New Query Runner (Data Source)
+- [ ] New Alert Destination
+- [ ] Other
+
+## Description
+
+## Related Tickets & Documents
+
+## Mobile & Desktop Screenshots/Recordings (if there are UI changes)

.github/config.yml

@@ -0,0 +1,5 @@
+# https://github.com/behaviorbot/request-info?installation_id=189571
+requestInfoLabelToAdd: needs-more-info
+requestInfoReplyComment: >
+  We would appreciate it if you could provide us with more info about this issue/pr!
+

.github/support.yml

@@ -0,0 +1,23 @@
+# Configuration for Support Requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: Support Question
+
+# Comment to post on issues marked as support requests, `{issue-author}` is an
+# optional placeholder. Set to `false` to disable
+supportComment: >
+  :wave: @{issue-author}, we use the issue tracker exclusively for bug reports
+  and planned work. However, this issue appears to be a support request.
+  Please use [our forum](https://discuss.redash.io) to get help.
+
+# Close issues marked as support requests
+close: true
+
+# Lock issues marked as support requests
+lock: false
+
+# Assign `off-topic` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Repository to extend settings from
+# _extends: repo

.github/weekly-digest.yml

@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: mon
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true

.gitignore

@@ -1,7 +1,12 @@
+.venv
+venv/
+.cache
+.coverage.*
 .coveralls.yml
 .idea
 *.pyc
 .coverage
+coverage.xml
 client/dist
 .DS_Store
 celerybeat-schedule*
@@ -9,14 +14,8 @@ celerybeat-schedule*
 \#*#
 *~
 _build
-
-# Vagrant related
-.vagrant
-Berksfile.lock
-redash/dump.rdb
+.vscode
 .env
-.ruby-version
-venv
 
 dump.rdb
 
@@ -24,3 +23,6 @@ node_modules
 .tmp
 .sass-cache
 npm-debug.log
+
+cypress/screenshots
+cypress/videos

CHANGELOG.md

@@ -1,5 +1,728 @@
 # Change Log
 
+## v7.0.0 - 2019-03-17
+
+We're trying a new format for the CHANGELOG in this release. Focusing on the bigger changes, but for whoever interested, you can see all the changes [here](https://github.com/getredash/redash/compare/v6.0.0...master).
+
+Besides all the features, bug fixes and improvements listed below we managed to convert a large portion of Redash's frontend code from Angular.js to React. You can see status in [#3071](https://github.com/getredash/redash/issues/3071).
+
+This release was made possible with the help of 34 contributors. 🙇‍♂️
+
+### Data Sources
+
+- **All data source options are now encrypted in the database.** By default the encryption uses the `REDASH_COOKIE_SECRET` value (`redash.settings.COOKIE_SECRET`), but you can specify a different value by setting the `REDASH_SECRET_KEY` environment variable value. Note that you need to set this _before_ doing the upgrade.
+- New Data Sources: Uptycs and Apache Drill.
+- Snowplow: is now enabled by default & supports region setting.
+- Elasticsearch: add support for Amazon Elasticsearch IAM authentication (with IAM profile or key/secret pair).
+- PostgreSQL: add support for serializing range values.
+- Redshift: remove duplicate column information for late-binding views.
+- Athena: load all databases (using pagination).
+- BigQuery: correctly handle temp tables with no schema field.
+- Jira (JQL): support for fetching all records with pagination.
+- Prometheus: fix schema loading and add support for query range.
+
+### In-app Help
+
+You can now open the [Knowledge Base](https://redash.io/help) inside the application. We also added a few "help triggers" in the app, that will open the Knowledge Base in context of what you're currently doing.
+
+### Parameters
+
+- **Dashboard Parameters**: We improved the flow of adding queries with parameters to dashboards and now give you full control over how parameters are mapped. You no longer have to make sure all parameters have the same name or use the `Global` checkbox. We also added new options, like keeping the parameter local to the widget or setting a static value. [Read more in our Knowledge Base →](https://redash.io/help/user-guide/querying/query-parameters#Parameter-Mapping-on-Dashboards)
+- We added server side validation of parameter values for all parameter types, except for parameters of `text` type. All validated parameter types are considered safe. When a query is using safe parameters (or no parameters at all), View Only users can refresh it.
+- Refreshing safe queries is done using the new results API endpoint, which takes only a query ID (and optionally parameter values) and does not need the query text.
+
+### Query Editor Improvements
+
+- Run only the highlighted query text: hit Execute after highlighting a portion of your query and only the selected portion will be sent to the database. This is useful for testing sub-SELECT statements and CTE's.
+- Improved auto complete: add a dot . after a table name in the query editor and auto complete will only suggest columns on that table.
+- Autosave parameter configuration changes.
+- YAML syntax support (for data sources like Yandex Metrica).
+
+### Improved Query Scheduler
+
+The Query Scheduler got a face lift and some new options: you can pick a day for a weekly schedule to run on and also set an end date after which the query will no longer execute on schedule.
+
+### Data Sources
+
+We added Apache Drill, Uptycs and a new JSON data source. Also fixed a few bugs in Athena's query runner and others.
+
+### User Management
+
+The users page got revamped with a new look and feel and few new features:
+
+- An indication when a user was last active.
+- Show if an invited user hasn't finished the setup process yet (Pending Invitations section).
+- You can now generate a new API key for users, if there's a concern it was compromised.
+
+### Admin
+
+- New Celery queues status screens, replacing the old Queries Status and better reflecting the status of running queries.
+- Make the queue name for schema refresh job configurable. The default used to be hard coded `schemas`, which is not available on all setups. Now it's `celery`.
+- The `gevent` library is installed by default, and you can now setup gunicorn to use `gevent` based workers.
+- New Docker entrypoint command to do a health check for a worker process.
+- Flask-Admin is no longer setup or supported.
+
+### Other Changes
+
+- New Alert destination: Google Hangouts Chat.
+- When downloading results from the results API it will set a user friendly filename for the downloaded file.
+- Archived Queries section added to the queries list.
+
+### Bug Fixes
+
+- Fixed: fork query does not fork tables but instead adds default table.
+- Fixed: when deleting a visualization, any widget using it was left empty on the dashboard.
+- Fixed: issues with Query Editor resizing on new versions of Chrome.
+- Fixed: issues with exporting dictionaries to Excel.
+- Fixed: Cohort visualization gets stuck when passing string values.
+- Fixed: use series name for Pie chart label.
+- Make sure Flask app created in Celery's worker process (could cause some query runners to get stuck while running queries).
+
+## v6.0.0 - 2018-12-16
+
+v6.0.0 release version. Mainly includes fixes for regressions from the beta version.
+
+This release had contributions from 5 people: @rauchy, @denisov-vlad, @arikfr, @ariarijp, and @gabrieldutra. Thank you, everyone 🙏
+
+### Changed
+
+- #3183 Make refresh_queries less noisey in logs. @arikfr
+
+### Fixed
+
+- #3163 Include correct version in production builds. @rauchy
+- #3161 Clickhouse: fix int() conversion error. @denisov-vlad
+- #3166 Directly using record_event task requires timestamp. @arikfr
+- #3167 Alert.evaluate failing when the column is missing. @arikfr
+- ##3162 Remove API permissions for users who have been disabled. @rauchy
+- #3171 Reject empty query name. @ariarijp
+- #3175, #3186 Fix disable error message. @rauchy, @gabrieldutra
+- #3182 [Redshift] support for schema names with dots. @arikfr
+- #3187 Safely create_app in Celery code (try to fetch current_app first). @arikfr
+
+### Other
+
+- #3155 Add DB Seed to Cypress and setup Percy. @gabrieldutra
+- #3180 Remove coverage from pytest terminal output. @rauchy
+
+## v6.0.0-beta - 2018-12-03
+
+This release was 2 months in the making and it is full with good stuff!
+
+- We have 5 new data sources: Databricks, IBM DB2, Kylin, Druid and Rockset. ⌗
+- There are fixes and improvements to 11 existing data sources (MySQL, Redshift, Postgres, MongoDB, Google BigQuery, Vertica, TreasureData, Presto, ClickHouse, Google Sheets and Google Analytics).
+- The Query Results data source can now load cached results, just use the `cached_query_` prefix instead of `query_`.
+- On the visualizations front we added a Heatmap visualization and did updated the table and counter visualizations.
+- Alerts got some fixes and a new destination: PagerDuty.
+- If the live autocomplete in the code editor annoys you, you can disable it now (although we're working to make it better, see #3092).
+- Fast queries will now load faster. 🏃‍♂️
+- We improved the layout of visualizations and content on smaller screen sizes. 📱
+- For those of you who like sharing, you can now enable the ability to share ownership of queries and dashboards and let others to edit them. Check the Settings page to enable this feature.
+
+There were also important changes to the code and infrastructure:
+
+- More components moved to React.
+- We switched to Webpack 4 with the help of @dmonego.
+- We upgraded to Celery 4 with the help of @emtwo, @jezdez, @mashrikt and @atharvai.
+- We started moving towards Python 3 for our backend. The first step was to make sure our code pass basic sanity tests with Flake 8, which was implemented by @cclauss.
+- We improved our testing on the frontend by adding setup for Jest tests and E2E testing using Cypress (@gabrieldutra).
+- Each pull request now gets a deploy preview using Netlify to easily test frontend changes.
+
+This is just a summary, you're welcome to review the full list below. ⬇
+
+This release had contributions from 38 people: @arikfr, @kravets-levko, @jezdez, @kyoshidajp, @kocsmy, @alison985, @gabrieldutra, @washort, @GitSumito, @emtwo, @rauchy, @alexanderlz, @denisov-vlad, @ariarijp, @yoavbls, @zhujunsan, @sjakthol, @koooge, @SakuradaJun, @dmonego, @Udomomo, @cclauss, @combineads, @zaimy, @Trigl, @ralphilius, @jodevsa, @deecay, @igorcanadi, @pashaxp, @hoangphuoc25, @toph, @burnash, @wankdanker, @Yossi-a, @Rovel, @kadrach, and @nicof38. Thank you, everyone 🙏
+
+### Added
+
+- #2747, #3143 Add a new Databricks query runner. @alison985, @jezdez, @arikfr
+- #2767 Add ability to add viz to dashboard from query edit page. @alison985, @jezdez
+- #2780 Add a query autocomplete toggle. @alison985, @jezdez, @arikfr
+- #2768 Add authentication via JWT providers. @SakuradaJun
+- #2790 Add the ability to sort favorited queries, paginate the dashboard list and improve UI inconsistencies. @jezdez
+- #2681 Add ability to search table column names in schema browser. @alison985
+- #2855 Add option to query cached results. @yoavbls
+- #2740 Add ability for extensions to add periodic tasks. @emtwo
+- #2924 Google Spreadsheets: Add support for opening by URL. @alexanderlz
+- #2903 Add PagerDuty as an Alert Destination. @alexanderlz
+- #2824 Add support for expanding dashboard visualizations. @sjakthol
+- #2900 Add ability to specify a counter label. @ralphilius
+- #2565 Add frontend extension capabilities. @emtwo
+- #2848 Add IBM Db2 as a data source using the ibm-db Python package. @nicof38
+- #2959 Add option to auto reload widget data in shared dashboards. @arikfr
+- #2993 Add page size settings. @kyoshidajp
+- #2080 New Heatmap chart visualization with Plotly. @deecay
+- #2991 Show users in CLI group list. @GitSumito
+- #2342 New SQLPARSE_FORMAT_OPTIONS setting to configure query formatter. @ariarijp
+- #3031 Add some tests for Query Results. @ariarijp
+- #2936 Add Kylin data source. @Trigl
+- #3047 Add Druid data source. @rauchy
+- #3077 New user interface for the feature flag of the share edit permissions feature. @arikfr
+- #3007 Add permissions to the result of "manage.py groups list" command. @Udomomo
+- #3088 Add get_current_user() fuction for the Python query runner. @kyoshidajp
+- #3114 Add event tracking to autocomplete toggle. @arikfr
+- #3068 Add Rockset query runner. @igorcanadi, @arikfr
+- #3105 Display frontend version. @rauchy
+
+### Changed
+
+- #2636 Rewrite query editor with React. @washort, @arikfr
+- #2637 Convert edit-in-place component to React. @washort, @arikfr
+- #2766 Suitable events are now being recorded server side instead of in the frontend. @alison985, @jezdez
+- #2796 Change placement (right/bottom) of chart legend depending on chart width. @kravets-levko
+- #2833 Uses server side sort order for tag list and show count of tagged items. @jezdez
+- #2318 Support authentication for the URL data source. @jezdez
+- #2884 Rename Yandex Metrika to Metrica. @jezdez
+- #2909 MySQL: hide sys tables. @arikfr
+- #2817 Consistently use simplejson for loading and dumping JSON. @jezdez
+- #2872 Use Plotly's function to clean y-values (x may be category or date/time). @kravets-levko
+- #2938 Auto focus tag input. @kyoshidajp
+- #2927 Design refinements for queries pages. @kocsmy
+- #2950 Show activity status in CLI user list. @GitSumito
+- #2968 Presto data source: setting protocol (http/https), safe loading of error messages. @arikfr
+- #2967 Show groups in CLI user list. @GitSumito
+- #2603 MongoDB: Update requirements to support srv. @arikfr
+- #2961 MongoDB: Skip system collections when loading schema. @arikfr
+- #2960 Add timeout to various HTTP requests. @arikfr
+- #2983 Databricks: New logo, updated name and enabled by default. @arikfr
+- #2982 Table visualization: change default size to 25 and add more size options. @arikfr
+- #2866 Redshift: Hide tables the configured user cannot access. @sjakthol
+- #3058 Mustache: don't html-escape query parameters values. @kravets-levko
+- #3079 Always use basic autocomplete, as well as the live autocomplete. @arikfr
+- #3084 Support tel://, sms://, mailto:// links in query results. @zhujunsan
+- #3083 Clickhouse: Add WITH TOTALS option support. @denisov-vlad
+- #3063 Allow setting colors for bubble charts. @toph
+- #3085 BigQuery: Switch to Standard SQL as the default. @kyoshidajp
+- #3094 Tags autocomplete: Show note when creating a new label. @kravets-levko
+- #2984 Autocomplete toggle improvements. @arikfr
+- #3089 Open new tab when forking a query. @kyoshidajp
+- #3126 MongoDB: add support for sorting columns. @arikfr
+- #3128 Improve backoff algorithm of query results polling to speed it up. @arikfr
+- #3125 Vertica: update driver & add support for connection timeout. @arikfr
+- #3124 Support unicode in Postgres/Redshift schema. @arikfr
+- #3138 Migrate all tags components to React. @kravets-levko
+- #3139 Better manage permissions modal. @kocsmy
+- #3149 Improve tag link colors and fix group tags on Users page. @kocsmy
+- #3146 Update, replace and fix new alert destination logos so it fits better. @kocsmy
+- #3147 Add and improve recent db logos that didn't fit in size properly. @kocsmy
+- #3148 Fix label positioning on no found screen. @kocsmy
+- #3156 json_dumps: add support for serializing buffer objects. @arikfr
+
+### Fixed
+
+- #2849 Fix invalid reference to alert.to_dict() in webhook. @wankdanker
+- #2840 Improve counter visualization text scaling. @kravets-levko
+- #2854 Widget titles are no longer rendered wrong on public dashboards. @kravets-levko
+- #2318 Removed redundant exception handling in data sources since that's handled in the query backend. @jezdez
+- #2886 Fix Javascript build that broke because registerAll tried to run EditInPlace component. @arikfr
+- #2911 Don’t show “Add to dashboard” in dropdown to unsaved queries. @jezdez
+- #2916 Fix export query results output file name. @gabrieldutra
+- #2917 Fix output file name not changing after rename query. @gabrieldutra
+- #2868 Address edge case when retrieving Glue schemas for Athena data source. @kadrach
+- #2929 Fix: date value in a filter is duplicated. @combineads
+- #2875 Unbreak charts with long legend break in horizontal mode. Update plotly.js. @kravets-levko
+- #2937 Fix event recording in admin API backend. @kyoshidajp
+- #2953 Minor fixes for the Clickhouse data source. @denisov-vlad
+- #2941 Bring back fix to Box plot hover. @arikfr
+- #2957 Apply missing CSS classes to EditInPlace component. @arikfr
+- #2897 Show "Add description" only after saving the query. @arikfr
+- #2922 Query page layout improvements for small screens. @kravets-levko
+- #2956 Clickhouse: move timeout to params. @denisov-vlad
+- #2964 Fix no tags shown when having empty set. @gabrieldutra
+- #2757 Use full text search ranking when searching in list views. @jezdez
+- #2969 Query Results data source: improved errors, quoted column names. @arikfr
+- #2906 Preventing open redirection in loging process. @kyoshidajp
+- #2867 TreasureData: Deduplicate column names. @zaimy
+- #2994 Fix scheme of various URLs from http to https. @kyoshidajp
+- #2992 Fix an invalid prop type warning in new version notifier. @kyoshidajp
+- #3022 Fix Toolbox covering part of a chart. @kravets-levko
+- #2998 Fix charts losing responsive features after refreshing the dashboard. @kravets-levko
+- #3034 Postgres: handle NaN/Infinity values. @kravets-levko
+- #2745 Sort columns with undefined values. @Yossi-a
+- #3041 Sort CLI output of lists. @GitSumito
+- #2803, #3006 Address various tag display issues on query list page. @kocsmy, @alison985
+- #3049 Fix edit-in-place component which ignored isEditable flag and didn't work on Groups page. @kravets-levko
+- #2965 Google Analytics: Fix crash when no results are returned. @alexanderlz
+- #3061 Fix table visualization so that the horizontal scrollbar is not be always visible. @kravets-levko
+- #3076 Add white-space padding to separators in the footer. @burnash
+- #2919 Fix URL data source to not require a URL. @arikfr
+- #3098 Force AngularJS to update query editor properly. @washort
+- #3100 Delete redundant regex segment in query result frontend. @zhujunsan
+- #2978 Prevent the query update timestamp from changing when it is linked to new query results. @rauchy
+- #3046 Fix query page header. @kravets-levko
+- #3097 Mongo: Fix collection fields retreival bug when Views are present. @jodevsa
+- #3107 Keep query text in local state for now. @washort
+- #3111 Fix mobile padding issues on Query results. @kocsmy
+- #3122 Show menu divider only if query is archived. @jezdez
+- #3120 Fix tag counts for dashboards and queries. @jezdez
+- #3141 Fix schema refresh to work on MySQL 8. @hoangphuoc25
+- #3142 Fix: editing dashboard title results in the visualizations being replaced by the loading markers. @kravets-levko
+
+### Other
+
+- #2850 The setup scripts are now based on Ubuntu 18.04 LTS and Docker. @pashaxp, @arikfr
+- #2985 Add Jest based tests to our stack. @arikfr
+- #2999 Add netlify configuration. @arikfr
+- #3000 Initial Cypress based E2E test infrastructure. @gabrieldutra
+- #2898 Move Ant styles into a central location. @arikfr
+- #2910 Fix webpack build error about BigMessage. @jezdez
+- #2928 Speed up builds by skipping installing requirements_all_ds.txt in CI unit tests. @arikfr
+- #2963 Fix tarball build failure. @emtwo
+- #2996 Fix setup.sh failures when run as root. @arikfr
+- #2989 Rearrange make targets. @koooge
+- #3036 Update Flask-Admin to 1.5.2. @yoavbls
+- #2901 Fix documentation links. @kravets-levko
+- #3073 Remove only Redash containers in clean Make task. @ariarijp
+- #3048 Remove pytest-watch dependency to workaround an issue with watchdog. @rauchy
+- #2905 Update development docker-compose.yml file to use latest Redis and Postgres servers and specify working volume explictly. @Rovel
+- #3032 Makefile: Add make targets for test. @koooge
+- #2933 Switch to Webpack 4. @dmonego
+- #2908 Update setup files. @arikfr
+- #2946 Update snowflake_connector_python version. @arikfr
+- #2773 Upgrade to Celery 4.2.1. @emtwo, @jezdez
+- #2881 CircleCI: Make flake8 tests pass on Legacy Python and Python 3. @cclauss
+- #2907 Remove unused dependencies (honcho, wsgiref). @arikfr
+- #3039 Build docker image on master branch. @arikfr
+- #3106 Fix registerAll failures after minification. @arikfr
+
+## v5.0.2 - 2018-10-18
+
+### Security
+
+- Fix: prevent Open Redirect vulnerability.
+
+## v5.0.1 - 2018-09-27
+
+### Added
+
+- Added support for JWT authentication (for services like Cloudflare Access or Google IAP).
+
+### Changed
+
+- Upgraded Celery version to 3.1.26 to make upgrade to Celery 4 easier.
+
+## v5.0.0 - 2018-09-21
+
+Final release for V5. Most of the changes were already in the beta release of V5, but this includes several fixes along
+with UI improvements.
+
+🙏 Thanks to @arikfr, @jezdez, @kravets-levko, @alison985, @kocsmy, @yossi-a, @tdsmith, @nasmithan, @jrbenny35, @sjakthol, @ariarijp and @combineads who contributed to this release.
+
+### Security
+
+- Fix: don't expose Google OAuth client secret. @arikfr
+
+### Changed
+
+- Improve mobile rendering of dashboards and queries. @kocsmy
+- UI improvements for favorites and empty state. @arikfr
+- Remove unnecessary X at the end of the query search. @kocsmy
+- Add server-side sorting to dashboard list. @jezdez
+- Sort queries in descending order. @jezdez
+- Throw error when non-owner tries to add a user to dashboard permissions. @alison985
+- Propagate query execution errors from Celery tasks properly. @alison985
+- Reload the route when using the app header search input. @jezdez
+
+### Fixed
+
+- Fix: BigQuery default location is null and not US. @arikfr
+- Fix: query embeds are broken. @arikfr
+- Fix: typo in Celery log foramt. @ariarijp
+- Use QuerySerializer in outdated queries list. @jezdez
+- Fix: sometimes widgets are getting zero height. @kravets-levko
+- Athena: Switch to simple_json to serialize NaN/Infinity values as nulls. @kravets-levko, @jezdez
+- Fix: queries with parameters with no value breaking the scheduler. @arikfr
+- Fix: MongoDB query results parser didn't support unicode keys. @arikfr
+- Fix: Google Analytics schema wasn't loading in some cases. @arikfr
+- Fix: date/time parameters not working as global param @kravets-levko.
+- Fix: Widgets crumble when trying to move / resize a widget. @kravets-levko
+- Fix: handling rows with "length" field with forOwn method. @yossi-a
+- Fix: query selection not working on alert page. @sjakthol
+- Fix: query_results for Embedded Parameters (removed deprecated to_dict function). @nasmithan
+- Fix: unicode not supported in dashboard search. @combineads
+- Fix: unicode not supported in users search. @arikfr
+
+### Other
+
+- Add test for using saved parameters in scheduled queries. @alison985
+- Minor code smell cleanup. @jezdez
+- Update QueryResultListResource docstring. @tdsmith
+- Switch to CirlceCI 2.0 @jrbenny35, @arikfr
+- Remove unnecessary init methods. @jezdez
+
+## v5.0.0-Beta - 2018-08-06
+
+This is the first beta of the V5 release (and hopefully the last one). This version includes a lot of exciting new additions along with bug fixes and other changes.
+
+Some notable changes:
+
+- Extensive work on parameters UI:
+  - New Date Range parameter type.
+  - UI for creating new parameters.
+  - Support for Now/Today as default value of date/time parameter.
+- Tagging and favorites ⭐️ support for queries and dashboards.
+- Users list page was improved (search, additional information) and you can now disable users.
+- Query editor improvements: additional keyboard shortcuts and support for searching in query text.
+- Visualizations improvements: option to select colors of pie chart sectors, X Axis type auto detect and option to format values, labels and tooltips.
+- Data Sources:
+  - Support for Yandex Metrika and AppMetrika.
+  - BigQuery: location property support and schema will load all tables now.
+  - Elasticsearch: stop sending source_content_type parameter which wasn't supported in older versions.
+- Started migrating the frontend codebase to React.
+
+And much more!
+
+🙏 Thanks to @kravets-levko, @arikfr, @ariarijp, @alison985, @kyoshidajp, @kocsmy, @denisov-vlad, @deecay, @yuua, @emtwo, @Pablohn26, @sieben, @atharvai, @matsumo, @tdawber, @innovia, @gabrieldutra, @coreyhuinker, @maxv, @sjakthol, @mtrbean and @washort who contributed to this release!
+
+### Added
+
+- #2712: Date/Time Range parameter type (@kravets-levko)
+- #2482: Add support for ChatWork Alert Destination. (@matsumo)
+- #2678: Explicit "Add Parameter" Button in Query Editor. (@kravets-levko)
+- #2513: Add location property to BigQuery data source settings. (@kyoshidajp)
+- #2616: Pie chart: support setting pie chart sector colors. (@kravets-levko)
+- #2697: Date/Time parameters: support for "Now" as default value. (@kravets-levko)
+- #2693: Enable search function in Query Editor. (@arikfr)
+- #2573: Tagging and favorites for Queries and Dashboards (@arikfr)
+- #2640: Keyboard shortcut to collapse query editor/schema browser (@kravets-levko)
+- #2674: Add support for the Chrome Logger extension (@arikfr)
+- #2653: Add redash db size to status page (@alison985)
+- #2669: Store Athena query id with result metadata (@tdawber)
+- #2546: Configuration for incorporating React components (@washort)
+- #2533: New datasource: Yandex Metrika & AppMetrika (@denisov-vlad)
+- #2536: Chart: formats for values, labels and tooltips (@kravets-levko)
+- #2560: Introduce Policy object (@arikfr)
+- #2380: Admin should be able to disable a user (@kravets-levko)
+- #2509: Show custom date format on settings page (@kyoshidajp)
+
+### Changed
+
+- #2715: Improve users list page (@arikfr)
+- #2710: Update Ant variables to fit Redash's style (@kocsmy)
+- #2709: Move format button next Add New Param button. (@arikfr)
+- #2664: Dashboard shows a spinner when query failed to load (@kravets-levko)
+- #2626: Show real status when loading cached query result (@kravets-levko)
+- #2663: Set column name implicitly when column name is blank (@ariarijp)
+- #2695: Improve Date/DateTime type parameters (@kravets-levko)
+- #2694: Block users with disposable email addresses (@arikfr)
+- #2687: YAML: changed load to safe_load (@denisov-vlad)
+- #2514: Update value parsing for google spreadsheets source (@atharvai)
+- #2570: fixes query pagination alignment (@alison985)
+- #2584: keep query result pagination out of scroll (@alison985)
+- #2647: Improve Script Query Runner (@ariarijp)
+- #2583: Query header improvements on widgets (@kocsmy)
+- #2671: Save some space (@kocsmy)
+- #2658: delaying schema filtering to improve responsiveness (@alison985)
+- #2648: Update datasource documentation links (@Pablohn26)
+- #2613: Improve Script Query Runner (@ariarijp)
+- #2619: data source sort case insensitive (@alison985)
+- #2604: Improve Google Spreadsheets Query Runner (@ariarijp)
+- #2542: Closes #2541: x-axis improvements. (@emtwo)
+- #2590: Remove redundant variables (@ariarijp)
+- #2585: Show data only mode: allow to add and delete visualizations (@kravets-levko)
+- #2549: Allow get_tables to see views and v10-style partitioned tables (@coreyhuinker)
+- #2568: sort datasources alphabetically (@alison985)
+- #2444: feat: show error if saml response cannot be parsed (@sjakthol)
+- #2554: Display name to be delete (@kyoshidajp)
+- #2510: Display confirmation dialog when deleting a item (@kyoshidajp)
+- #2518: Design improvements (@kocsmy)
+- #2520: Filter data sources in a data source input area (@kyoshidajp)
+
+### Fixed
+
+- #2722: Elasticsearch: Don't send source_content_type parameter. (@arikfr)
+- #2719: Remove closing input tags (@maxv)
+- #2458: Get all tables in the BigQuery (@kyoshidajp)
+- #2698: Make sure we return distinct data source values (@arikfr)
+- #2315: Fix: pyHive type matches (@yuua)
+- #2638: Dashboard stops rendering when adding widget with empty query (@kravets-levko)
+- #2610: Fix export query results output file name (@gabrieldutra)
+- #2574: commit query result to db before evaluating alerts (@mtrbean)
+- #2580: add break-word wrap to add/edit text box on dashboard (@alison985)
+- #2578: Fix connection error when you run "create_tables" (@ariarijp)
+- #2572: remove extra menu line if query is archived (@alison985)
+- #2526: Fix pivot hide control in dashboards (@deecay)
+- #2511: Fixing signed_out.html template (@kocsmy)
+- #2523: Frontend: fix boolean field with null value display as null. (@innovia)
+
+### Other
+
+- #2682: Add Zeit's now support to have preview builds for every PR (@arikfr)
+- #2668: Upgrade bootstrap script to Redash 4.0.1 (@ariarijp)
+- #2639: Add tests for SpreadSheets (@ariarijp)
+- #2635: Add tests for Query Results (@ariarijp)
+- #2537: Remove trailing semicolon (@sieben)
+
+## v4.0.1 - 2018-05-02
+
+### Added
+
+- Log user's screen resolution. @arikfr
+
+### Changed
+
+- [Redshift] fix the order of columns in the schema browser. @akiray03
+- Improve dashboard refresh UX: show previous data while refreshing. @arikfr
+
+### Fixed
+
+- Disable fork button to view_only users. @tonyjiangh
+- Hide overflowing data source and alert destination names. @kocsmy
+- Login pages were broken on mobile. @kocsmy
+- Cohort visualization wasn't rendering if value wasn't properly detected as date. @kravets-levko
+- Dashboard filters setting wasn't persisting. @arikfr
+- Display nulls and empty values as blank in table numeric fields. @chriszs
+- Date column on alerts page is labeled "Created By". @dbravender
+- Bootstrap script was breaking due to incompatability with pip 10. @ariarijp
+
+### Other
+
+- Updated README. @kocsmy
+
+## v4.0.0 - 2018-04-16
+
+### Added
+
+- MatterMost alert destination. @alon710
+- Full screen view on map visualizations. @deecay
+- Choropleth map visualization 🗺. @kravets-levko
+- Report Celery queue size. @arikfr
+- Load dashboard refresh rate from URL. @arikfr
+- Configuration for query refresh intervals. @arikfr
+
+### Changed
+
+- TreasureData: improve query failure message. @toru-takahashi
+- Update botocore version (fixes an issue with loading Athena tables). @arikfr
+- Changed Map visualization name to "Map (Markers)" to distinguish from the Choropleth one. @arikfr
+- Use MongoClient for ReplicaSet connections. @fmy
+- Update pymongo version to support newer MongoDB versions. @arikfr
+- Changed "his" to "their" in user creation form success message. @tnetennba3
+- Show friendly names in dynamic forms labels. @arikfr
+- Render safe HTML by default in tables to remain backward compatible. @arikfr
+- Apply time limit to alert status checking task. @arikfr
+- Plotly: increase Y value accuracy. @arikfr
+- close metadata database connection early in the execute query Celery task. @arikfr
+
+### Fixed
+
+- Query page layout gets messed up when clicking on "cancel" in "Do you want to leave this page?" dialog. @kravets-levko
+- docker-entrypoint broke for other database names than "postgres". @valentin2105
+- (BigQuery) UDF URI was used even if empty. @arikfr
+- Show correct Box Plot chart hover data. @deeccay
+- Fork button shows in data only view, but not working. @arikfr
+- Saving widget sends too much data to the server, sometimes making dashboard save fail. @arikfr
+- DynamoDB: always return counter as a number rather than string. @arikfr
+- MSSQL: UUID fields were detected as booleans. @arikfr
+- The whole dashboard page reloads when clicking on refresh. @arikfr
+- Line chart with category x-axis: when some values missing, wrong hints displayed on hover. @kravets-levko
+- Second Y-axis not displayed when stacking enabled. @kravets-levko
+- Widget with empty contents had extra 40px of white space (paddings of container). @kravets-levko
+- Add scrollbars to pivot table widgets. @kravets-levko
+- Multiple performance, usability and auto-height related fixes to the dashboard rendering engine (also switched to GridStack). @kravets-levko
+- Login form missing on LDAP logging page. @idalin
+- Empty state: show connect data source link only to admins. @arikfr
+- Dashboard "dancing" widgets (when auto-height enabled). @kravets-levko
+
+### Other
+
+- Webpack: ignore vim swap files. @deecay
+
+## v4.0.0-rc.1 - 2018-03-05
+
+### Added
+
+- Configuration for query refresh intervals.
+- [Prometheus] Support for range queries. @jubel-han
+- Extensions system based on Python entrypoints. @jezdez
+- Funnel visualization. @tonyjiangh
+- UI to edit allowed Google OAuth domains. @arikfr
+- Empty state for homepage, alerts, queries and dashboards pages. @kocsmy, @arikfr
+
+### Changed
+
+- Maintain widget's auto-height state until it's been resized by the user. @kravets-levko
+- Change default table viz width from 4 to 3 columns. @kravets-levko
+- When saving dashboard adding or removing widgets, save only modified widgets (with changed size and/or position). @kravets-levko
+- Don't allow disabling Password based login if no SSO is enabled. @arikfr
+- Always show login page, even if password based login disabled. @arikfr
+- Upgrade `sqlparse` to 0.2.4. @ariarijp
+- Make sure datetime/number columns in table visualization don't wrap. @kravets-levko
+- Explicitly set order of tabs in settings page. @kravets-levko
+- User can no longer change the type of a saved visualization. @kravets-levko
+- Update docker-compose.yml to restart postgres/redis containers `unless-stopped`. @benmanns
+- New default colors for chart visualizations. @kocsmy
+- Updated design of all the authentication pages (login, forgot password, etc). @kravets-levko
+
+### Fixed
+
+- Glue schemas with more than 100 tables were showing only first 100 tables. @jezdez
+- Long visualizations dind't render scrollbars on some browsers. @kravets-levko
+- When the dataset was returning some columns name as non strings, table couldn't be rendered. @kravets-levko
+- Missing logos for Prometheus and Snowflake. @kocsmy
+- Render correct link to LDAP login on login page. @arikfr
+- Sort widgets by column/row to make sure they are placed correctly. @arikfr
+- Public dashboards were not rendered due to Javascript error. @kravets-levko
+
+## v4.0.0-beta - 2018-02-14
+
+### Added
+
+- Massive update to the UI/UX of the whole application. @kocsmy, @kravets-levko, @arikfr
+- Flexible dashboard layout: resize widgets both vertically and horizonally. @kravets-levko
+- Configuration and new options for the table visualization. @kravets-levko
+- API to return internal usage events. @arikfr
+- Add an option to set a common prefix to the backend logs. @arikfr
+- [MongoDB] support nested fields in results. @arikfr
+- Cohort visualization: add options and fix rendering logic. @kravets-levko
+- Table visualization: `URL` column type. @kravets-levko
+- Table visualization: `Image` column type. @kravets-levko
+- [BigQuery] show amount of data scanned. @arikfr
+- Make dashboard refresh intervals configurable. @arikfr
+- Button to insert table/column name from schema into the query text. @kravets-levko
+- [Athena] show amount of data scanned. @washort
+- [Salesforce] Add setting to set the API version. @mayconbordin
+- UI for configuration options (auth, date format, etc). @arikfr
+- CLI command to create the root user. @kyoshidajp
+- [Redshift] support for loading late binding views in schema browser. @tonyjiangh
+- Show user's profile picture and load it from Google when using Google OAuth. @kyoshidajp
+- CockroachDB query runner. @yershalom
+- MAPD query runner. @cdessanti
+- Pie chart: show subplot titles. @deecay
+
+### Changed
+
+- Make trusted header authentication compatible with multiorg mode. @sjakthol
+- Update AWS RDS certificate bundle. @arikfr
+- Add Prometheus to the default query runners list. @arikfr
+- [Athena] update botocore version to support Glue. @arikfr
+- Support for quotes passwords in the Redis and Postgres connection URLs. @javier-sanz
+- Change the way static assets are served. @arikfr
+- [BigQuery] Properly handle RECORD fields in schema (show the nested fields). @arikfr
+- Upgrade to Celery 3.1.25 in preparation to Celery 4. @jezdez
+- Remove loading indicator when updating query parameter value (before executing). @kravets-levko
+- Improvements to the chart visualization (see #2156 for details). @kravets-levko
+- Start searching for queries immediately instead of waiting for 3 characters. @kyoshidajp
+- Make all references to Elasticsearch be properly capitalized. @kakakakakku
+- Use PostgreSQL's FTS/tsvector type for query searches. @jezdez
+- [Redshift] Make sslmode configurable. @sjakthol
+- Allow passing options to tests Docker command. @arikfr
+- Improve error handling mechanism and make error pages friendlier. @kravets-levko, @kocsmy, @arikfr
+- Make LDAP settings names more consistent. @gramakri
+- [Oracle] support for non SELECT queries. @doddjc21
+- Admin can no longer remove themselves from the built-in groups. @negibouze
+- Update pie charts font style. @deecay
+- Upgrade psycopg2 for support PostgreSQL 10.0. @kyoshidajp
+- Convert all stylesheets to LESS. @kravets-levko
+- [Elasticsearch] Collect doc_count field from aggregation. @arjan
+- Switch to pytest. @jezdez
+- Ensure email is case-insensitive. @miketheman
+- [Redshift] change default SSL mode to prefer. @arikfr
+- Return Redis memory usage in bytes for easier monitoring. @kakakakakku
+- create_db command in docker-entrypoint waits for Postgres to become available first. @ariarijp
+- [Elasticsearch] set source_content_type on ES queries to support Elasticsearch 6.0. @alexdrans
+- Show `-` instead of `Invalid Date` for null values given to `dateTime` filter. @kyoshidajp
+
+### Fixed
+
+- Parameters list was resetting when adding a new parameter. @arikfr
+- Don't escape values in non-html columns. @kravets-levko
+- Commit SAML user group assignment to the database. @sjakthol
+- Update correct settings in SAML settings form. @sjakthol
+- Fix Google OAuth login in MULTIORG mode. @shinji19
+- Strip annotation from query when path is specified in Script query runner. @ariarijp
+- Fix filter headers when there are multiple rows of filters. @kocsmy
+- Update query version when changing query data source. @washort
+- Fix upgrade script to support changes in CircleCI. @rgjodekerken
+- Don't show error indicators after submitting the user form. @bamboo-yujiro
+- [Query Results] support unicode column names. @tonyjiangh
+- Issue with Google OAuth caused by old pyOpenSSL version. @crooy
+- Fix layout of outdated queries admin view. @bamboo-yujiro
+- User can't download query results of a new query. @arikfr
+- Typo in celery logs format. @ariarijp
+- Handling whitespace characters in Query Results data source. @ariarijp
+- [MySQL] Close cursor when cancellig the query. @jasonsmithj
+
+## v3.0.0 - 2017-11-13
+
+### Added
+
+- Query Result data source (run queries on query results).
+- Athena: option to load schema from Glue catalog. @myouju
+- Allow running any command inside the container via the Docker entrypoint script. @jezdez
+- Make invitation token max age configurable. @hhamalai
+- Redshift: add support for the new ACM root CA.
+- Redshift: support for Spectrum (external) tables. @atharvai
+- MongoDB: option to set allowDiskUse in queries.
+- Option to disable SQLAlchemy connection pool.
+- Option to set a time limit on adhoc queries.
+- Option to disable sending an invite to a new user.
+- Azure SQL Data Warehouse query runner. @kitsuyui
+- Prometheus query runner. @yershalom
+- Option to set the Flask-Limiter storage engine.
+- Option to set UnicodeWriter's error handling method. @fan-t-endo
+- PostgreSQL: SSL configuration option. @TylerBrock
+- Counter visualization: additional formatting options. @deecay
+- Query based drop down parameter. @rohithmenon
+- MySQL: multiple queries support & connection timeout.
+- Ability to select all in multi-filter. @Posnet
+- LDAP (Active Directory) support. @amarjayr
+
+### Changed
+
+- Copy parameters when forking a query. @kyoshidajp
+- Prevent using Query API Key with refresh API (previously it was just failing).
+- Reduce boilerplate in frontend code.
+- Set auto focus in first input items. @kyoshidajp
+- Update gunicorn to latest version.
+- Make log format configurable.
+- Sort series by name.
+- Allow setting test file with Docker test run. @meinac
+- Use outdated queries count stored already in Redis.
+- Show links based on permissions the user have.
+- Cassandra: update driver version. @yershalom
+- Docker-Compose: update configuration to always restart services. @muddydixon
+- Modernize Python 2 code to get ready for Python 3. @cclauss
+- Cohort visualization: make it friendlier to use by better handle gaps in data, so it's easier to generate the data needed.
+- Use a different markdown library. @alexmuller
+- Salesforce: improve error messages we receive from the API. @akiray03
+- Custom JS code visualization improvements. @deecay
+- DQL: Update version to 0.5.24. @aterreno
+- Cassandra: get_schema support for both C\* 2.x and 3.x, support for SortedSet type serialization. (@mfouilleul))
+- Replace deprecated ng-annotate with babel plugin. @44px
+- Update Python dependencies to recent versions. @alison985
+- Bootstrap script: create /opt/redash directory only if it doesn't exist. @isomura
+- Bootstrap script: make use of REDASH_BASE_PATH variable in setup script. @sylvain
+
+### Fixed
+
+- Require full data source access to fork a query.
+- API key of one query could be used to get results of another one.
+- Delete group id from user object when deleting the group. @kyoshidajp
+- Sorting of X axis wasn't working for Box plot type visualizations. @deecay
+- Exporting query results as excel was failing when one of the columns had array data. @kyoshidajp
+- Show query editor's Archive/Publish Query drop-down only on saved queries. @cyriac
+- Move misplaced configuration in docker-compose.production.yml. @yutannihilation
+- MySQL: support UTF8 schema.
+- TreasureData queries were failing when returning 0 rows.
+- Use series color for Boxplot. @deecay
+- Revoke permission should respect to given grantee and access type. @meinac
+- Fixed eslint "Cannot read property 'length' of undefined" error. @kravets-levko
+- Don't crash query editor when there are unclosed curly brackets.
+- Error value in charts wasn't displayed if it was 0.
+- Prevent line breaks in EditInPlace description when using Firefox. @alexmuller
+- Queries#all_queries was sometimes returning wrong number of queries.
+- record_event fails for API events.
+- Cancel button on tasks admin page was broken.
+- Remove deprecated cx_Oracle types. @queeno
+- Textbox widgets were updating their value even when editor was cancelled. @alison985
+- Collaborators couldn't edit visualizations or schedule.
+- Use series color for error bar. @deecay
+- Upgrade script was using the wrong restart command on new AMIs.
+
+## v2.0.1 - 2017-10-22
+
+This is a patch release, that adds support for Redshift ACM certificates (see #2044 for details).
+
 ## v2.0.0 - 2017-08-08
 
 ### Added
@@ -9,7 +732,7 @@
 - Add the propertyOrder field to specify order of data source settings. @rmakulov
 - Add Plotly based Boxplot visualization. @deecay
 - [Presto] Add: query cancellation support. @fbertsch
-- [MongoDB] add $oids JSON extension.
+- [MongoDB] add \$oids JSON extension.
 - [PostgreSQL] support for loading materialized views in schema.
 - [MySQL] Add option to hide SSL settings.
 - [MySQL] support for RDS MySQL and SSL.
@@ -79,7 +802,7 @@
 - [Google Spreadsheets] handle distant future dates.
 - [SQLite] better handle utf-8 error messages.
 - Fix: don't remove locks for queries with task status of PENDING.
-- Only split columns with __/:: that end with filter/MultiFilter.
+- Only split columns with \_\_/:: that end with filter/MultiFilter.
 - Alert notifications fail (sometime) with a SQLAlchemy error.
 - Safeguard against empty query results when checking alert status. @danielerapati
 - Delete data source doesn't work when query results referenced by queries.
@@ -98,7 +821,6 @@
 - PostgreSQL passwords with spaces were not supported. (#1056)
 - PivotTable wasn't updating after first save.
 
-
 ## v1.0.3 - 2017-04-18
 
 ### Fixed
@@ -145,7 +867,7 @@
 - Fix: query embed dialog close button wasn't working @r0fls
 - Fix: make errors from Presto runner JSON-serializable @washort
 - Fix: race condition in query task status reporting @washort
-- Fix: remove $$hashKey from Pivot table
+- Fix: remove \$\$hashKey from Pivot table
 - Fix: map visualization had severe performance issue.
 - Fix: pemrission dialog wasn't rendering.
 - Fix: word cloud visualization didn't show column names.
@@ -162,7 +884,7 @@
 ### Changed
 
 - [#1563](https://github.com/getredash/redash/pull/1563) Send events to webhook as JSON with a schema.
-- [#1601] [Presto] friendlier error messages. (@aslotnick)
+- [#1601][presto] friendlier error messages. (@aslotnick)
 - Move the query runner unavailable log message to be DEBUG level instead of WARNING, as it was mainly confusing people.
 - Remove "Send to Cloud" button from Plotly based visualizations.
 - Change Plotly's default hover mode to "Compare".
@@ -171,7 +893,7 @@
 ### Fixed
 
 - [#1564] Fix: map visualization column picker wasn't populated. (@janusd)
-- [#1597] [SQL Server] Fix: schema wasn't loading on case sensitive servers. (@deecay)
+- [#1597][sql server] Fix: schema wasn't loading on case sensitive servers. (@deecay)
 - Fix: dashbonard owner couldn't edit his dashboard.
 - Fix: toggle_publish event wasn't logged properly.
 - Fix: events with API keys were not logged.
@@ -186,7 +908,7 @@
 - Fix: extra whitespace created by the filters component.
 - Fix: query results cleanup task was trying to delete query objects.
 - Fix: alert subscriptions were not triggered.
-- [DynamoDB] Fix: count(*) queries were broken. (@kopanitsa)
+- [DynamoDB] Fix: count(\*) queries were broken. (@kopanitsa))
 - Fix: Redash is using too many database connections.
 - Fix: download links were not working in dashboards.
 - Fix: the first selection in multi filters was broken in dashboards.
@@ -203,9 +925,9 @@
 
 This version has two big changes behind the scenes:
 
-* Refactor the frontend to use latest (at the time) Angular version (1.5) along with better frontend pipeline based on
+- Refactor the frontend to use latest (at the time) Angular version (1.5) along with better frontend pipeline based on)
   WebPack.
-* Refactor the backend code to use SQLAlchemy and Alembic, for easier migrations/upgrades.
+- Refactor the backend code to use SQLAlchemy and Alembic, for easier migrations/upgrades.)
 
 Along with that we have many fixes, additions, new data sources (Google Analytics, ClickHouse, Amazon Athena, Snowflake)
 and fixes to the existing ones (mainly ElasticSearch and Cassandra).
@@ -288,7 +1010,7 @@ We're releasing a new upgrade script -- see [here](https://redash.io/help-onprem
 
 ### Added
 
-- 61fe16e #1374: Add: allow '*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)
+- 61fe16e #1374: Add: allow '\*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)
 - 2f09043 #1113: Add: share modify/access permissions for queries and dashboard (whummer)
 - 3db0eea #1341: Add: support for specifying SAML nameid-format (zoetrope)
 - b0ecd0e #1343: Add: support for local SAML metadata file (zoetrope)
@@ -352,7 +1074,6 @@ We're releasing a new upgrade script -- see [here](https://redash.io/help-onprem
 - 5d43cbe #1198: Change: add support for Standard SQL in BigQuery query runner (mystelynx)
 - 84d0c22 #1193: Change: modify the argument order of moment.add function call (Kenya Yamaguchi)
 
-
 ### Fixed
 
 - d6febb0 #1375: Fix: Download Dataset does not work when not logged in (Joshua Dechant)
@@ -467,7 +1188,7 @@ A big thank you goes to all who contributed code and documentation in this relea
 - e10ecd2 #1058: Bring back filters if dashboard filters are enabled (@AntoineAugusti)
 - 701035f #1059: Fix: DynamoDB having issues when setting host (@arikfr)
 - 2924d4f #1040: Small fixes to visualizations view (@arikfr)
-- fec0d5f #1037: Fix: multi filter wasn't working with __ syntax (@dheerajrav)
+- fec0d5f #1037: Fix: multi filter wasn't working with \_\_ syntax (@dheerajrav)
 - b066ce4 #1033: Fix: only ask for notification permissions if wasn't denied (@arikfr)
 - 960c416 #1032: Fix: make sure we return dashboards only for current org only (@arikfr)
 - b3844d3 #1029: Hive: close connection only if it exists (@arikfr)

CONTRIBUTING.md

@@ -6,11 +6,9 @@ The following is a set of guidelines for contributing to Redash. These are guide
 
 ## Quick Links:
 
-- [Feature Roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap)
 - [Feature Requests](https://discuss.redash.io/c/feature-requests)
-- [Gitter Chat](https://gitter.im/getredash/redash) or [Slack](https://slack.redash.io)
 - [Documentation](https://redash.io/help/)
-- [Blog](http://blog.redash.io/)
+- [Blog](https://blog.redash.io/)
 - [Twitter](https://twitter.com/getredash)
 
 ---
@@ -56,17 +54,19 @@ If you would like to suggest an enhancement or ask for a new feature:
 - **Code contributions are welcomed**. For big changes or significant features, it's usually better to reach out first and discuss what you want to implement and how (we recommend reading: [Pull Request First](https://medium.com/practical-blend/pull-request-first-f6bb667a9b6#.ozlqxvj36)). This to make sure that what you want to implement is aligned with our goals for the project and that no one else is already working on it.
 - Include screenshots and animated GIFs in your pull request whenever possible.
 - Please add [documentation](#documentation) for new features or changes in functionality along with the code.
-- Please follow existing code style. We use PEP8 for Python and sensible style for JavaScript.
+- Please follow existing code style:
+  - Python: we use PEP8 for Python.
+  - Javascript: we use Airbnb's style guides for [JavaScript](https://github.com/airbnb/javascript#naming-conventions) and [React](https://github.com/airbnb/javascript/blob/master/react) (currently we don't follow Airbnb's convention for naming files, but we're gradually fixing this). To make it automatic and easy, we recommend using [Prettier](https://github.com/prettier/prettier).
 
 ### Documentation
 
-The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/user-guide) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
+The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/src/pages/kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
 
 ## Additional Notes
 
 ### Release Method
 
-We publish a stable release every ~2 months, although the goal is to get to a stable release every month. You can see the change log on [GitHub releases page](http://github.com/getredash/redash/releases).
+We publish a stable release every ~2 months, although the goal is to get to a stable release every month. You can see the change log on [GitHub releases page](https://github.com/getredash/redash/releases).
 
 Every build of the master branch updates the latest *RC release*. These releases are usually stable, but might contain regressions and therefore recommended for "advanced users" only.
 
@@ -74,4 +74,4 @@ When we release a new stable release, we also update the *latest* Docker image t
 
 ## Code of Conduct
 
-This project adheres to the Contributor Covenant [code of conduct](http://redash.io/community/code_of_conduct). By participating, you are expected to uphold this code. Please report unacceptable behavior to team@redash.io.
+This project adheres to the Contributor Covenant [code of conduct](https://redash.io/community/code_of_conduct). By participating, you are expected to uphold this code. Please report unacceptable behavior to team@redash.io.

Dockerfile

@@ -1,13 +1,27 @@
+FROM node:10 as frontend-builder
+
+WORKDIR /frontend
+COPY package.json package-lock.json /frontend/
+RUN npm install
+
+COPY . /frontend
+RUN npm run build
+
 FROM redash/base:latest
 
+# Controls whether to install extra dependencies needed for all data sources.
+ARG skip_ds_deps
+
 # We first copy only the requirements file, to avoid rebuilding on every file
 # change.
 COPY requirements.txt requirements_dev.txt requirements_all_ds.txt ./
-RUN pip install -r requirements.txt -r requirements_dev.txt -r requirements_all_ds.txt
+RUN pip install -r requirements.txt -r requirements_dev.txt
+RUN if [ "x$skip_ds_deps" = "x" ] ; then pip install -r requirements_all_ds.txt ; else echo "Skipping pip install -r requirements_all_ds.txt" ; fi
 
-COPY . ./
-RUN npm install && npm run build && rm -rf node_modules
+COPY . /app
+COPY --from=frontend-builder /frontend/client/dist /app/client/dist
 RUN chown -R redash /app
 USER redash
 
 ENTRYPOINT ["/app/bin/docker-entrypoint"]
+CMD ["server"]

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017, Arik Fraimovich. 
+Copyright (c) 2013-2019, Arik Fraimovich.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

Makefile

@@ -1,20 +1,57 @@
-NAME=redash
-VERSION=`python ./manage.py version`
-FULL_VERSION=$(VERSION)+b$(CIRCLE_BUILD_NUM)
-BASE_VERSION=$(shell python ./manage.py version | cut -d + -f 1)
-# VERSION gets evaluated every time it's referenced, therefore we need to use VERSION here instead of FULL_VERSION.
-FILENAME=$(CIRCLE_ARTIFACTS)/$(NAME).$(VERSION).tar.gz
+.PHONY: compose_build up test_db create_database clean down bundle tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
 
-deps:
-	if [ -d "./client/app" ]; then npm install; fi
-	if [ -d "./client/app" ]; then npm run build; fi
+compose_build:
+	docker-compose build
 
-pack:
-	sed -ri "s/^__version__ = '([0-9.]*)'/__version__ = '$(FULL_VERSION)'/" redash/__init__.py
-	tar -zcv -f $(FILENAME) --exclude="optipng*" --exclude=".git*" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" --exclude="node_modules" *
+up:
+	docker-compose up -d --build
 
-upload:
-	python bin/release_manager.py $(CIRCLE_SHA1) $(BASE_VERSION) $(FILENAME)
+test_db:
+	@for i in `seq 1 5`; do \
+		if (docker-compose exec postgres sh -c 'psql -U postgres -c "select 1;"' 2>&1 > /dev/null) then break; \
+		else echo "postgres initializing..."; sleep 5; fi \
+	done
+	docker-compose exec postgres sh -c 'psql -U postgres -c "drop database if exists tests;" && psql -U postgres -c "create database tests;"'
 
-test:
-	nosetests --with-coverage --cover-package=redash tests/
+create_database:
+	docker-compose run server create_db
+
+clean:
+	docker-compose down && docker-compose rm
+
+down:
+	docker-compose down
+
+bundle:
+	docker-compose run server bin/bundle-extensions
+
+tests:
+	docker-compose run server tests
+
+lint:
+	./bin/flake8_tests.sh
+
+backend-unit-tests: up test_db
+	docker-compose run --rm --name tests server tests
+
+frontend-unit-tests: bundle
+	npm install
+	npm run bundle
+	npm test
+
+test: lint backend-unit-tests frontend-unit-tests
+
+build: bundle
+	npm run build
+
+watch: bundle
+	npm run watch
+
+start: bundle
+	npm run start
+
+redis-cli:
+	docker-compose run --rm redis redis-cli -h redis
+
+bash:
+	docker-compose run --rm server bash

README.md

@@ -5,7 +5,6 @@
     <img title="Build Status" src='https://circleci.com/gh/getredash/redash.png?circle-token=8a695aa5ec2cbfa89b48c275aea298318016f040'/>
 </p>
 
-[![Join the chat at https://gitter.im/getredash/redash](https://badges.gitter.im/getredash/redash.svg)](https://gitter.im/getredash/redash?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Documentation](https://img.shields.io/badge/docs-redash.io/help-brightgreen.svg)](https://redash.io/help/)
 
 **_Redash_** is our take on freeing the data within our company in a way that will better fit our culture and usage patterns.
@@ -13,37 +12,37 @@
 Prior to **_Redash_**, we tried to use traditional BI suites and discovered a set of bloated, technically challenged and slow tools/flows. What we were looking for was a more hacker'ish way to look at data, so we built one.
 
 **_Redash_** was built to allow fast and easy access to billions of records, that we process and collect using Amazon Redshift ("petabyte scale data warehouse" that "speaks" PostgreSQL).
-Today **_Redash_** has support for querying multiple databases, including: Redshift, Google BigQuery, PostgreSQL, MySQL, Graphite,
-Presto, Google Spreadsheets, Cloudera Impala, Hive and custom scripts.
+Today **_Redash_** has support for querying multiple databases, including: Redshift, Google BigQuery, PostgreSQL, MySQL, Graphite, Presto, Google Spreadsheets, Cloudera Impala, Hive and custom scripts.
 
 **_Redash_** consists of two parts:
 
-1. **Query Editor**: think of [JS Fiddle](http://jsfiddle.net) for SQL queries. It's your way to share data in the organization in an open way, by sharing both the dataset and the query that generated it. This way everyone can peer review not only the resulting dataset but also the process that generated it. Also it's possible to fork it and generate new datasets and reach new insights.
-2. **Dashboards/Visualizations**: once you have a dataset, you can create different visualizations out of it, and then combine several visualizations into a single dashboard. Currently it supports charts, pivot table and cohorts.
+1. **Query Editor**: think of [JS Fiddle](https://jsfiddle.net) for SQL queries. It's your way to share data in the organization in an open way, by sharing both the dataset and the query that generated it. This way everyone can peer review not only the resulting dataset but also the process that generated it. Also it's possible to fork it and generate new datasets and reach new insights.
+2. **Visualizations and Dashboards**: once you have a dataset, you can create different visualizations out of it, and then combine several visualizations into a single dashboard. Currently Redash supports charts, pivot table, cohorts and [more](https://redash.io/help/user-guide/visualizations/visualization-types).
 
-## Demo
-
-<img src="https://cloud.githubusercontent.com/assets/71468/17391289/8e83878e-5a1d-11e6-8938-af9054a33b19.gif" width="60%"/>
-
-You can try out the demo instance: http://demo.redash.io/ (login with any Google account).
+<img src="https://raw.githubusercontent.com/getredash/website/8e820cd02c73a8ddf4f946a9d293c54fd3fb08b9/website/_assets/images/redash-anim.gif" width="80%"/>
 
 ## Getting Started
 
-* [Setting up Redash instance](https://redash.io/help-onpremise/setup/setting-up-redash-instance.html) (includes links to ready made AWS/GCE images).
+* [Setting up Redash instance](https://redash.io/help/open-source/setup) (includes links to ready made AWS/GCE images).
 * [Documentation](https://redash.io/help/).
 
+## Supported Data Sources
+
+Redash supports more than 35 [data sources](https://redash.io/help/data-sources/supported-data-sources). 
 
 ## Getting Help
 
 * Issues: https://github.com/getredash/redash/issues
 * Discussion Forum: https://discuss.redash.io/
-* Slack: http://slack.redash.io/
-* Gitter (chat): https://gitter.im/getredash/redash
 
 ## Reporting Bugs and Contributing Code
 
 * Want to report a bug or request a feature? Please open [an issue](https://github.com/getredash/redash/issues/new).
-* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/setup/setting-up-development-environment-using-vagrant.html), and make a pull request. We need all the help we can get!
+* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/dev/guide.html), and make a pull request. We need all the help we can get!
+
+## Security
+
+Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use [this PGP key](https://keybase.io/arikfr/key.asc).
 
 ## License
 

bin/bundle-extensions

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+import os
+from subprocess import call
+from distutils.dir_util import copy_tree
+
+from pkg_resources import iter_entry_points, resource_filename, resource_isdir
+
+
+
+# Make a directory for extensions and set it as an environment variable
+# to be picked up by webpack.
+EXTENSIONS_RELATIVE_PATH = os.path.join('client', 'app', 'extensions')
+EXTENSIONS_DIRECTORY = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)),
+    EXTENSIONS_RELATIVE_PATH)
+
+if not os.path.exists(EXTENSIONS_DIRECTORY):
+    os.makedirs(EXTENSIONS_DIRECTORY)
+os.environ["EXTENSIONS_DIRECTORY"] = EXTENSIONS_RELATIVE_PATH
+
+for entry_point in iter_entry_points('redash.extensions'):
+    # This is where the frontend code for an extension lives
+    # inside of its package.
+    content_folder_relative = os.path.join(
+        entry_point.name, 'bundle')
+    (root_module, _) = os.path.splitext(entry_point.module_name)
+
+    if not resource_isdir(root_module, content_folder_relative):
+        continue
+
+    content_folder = resource_filename(root_module, content_folder_relative)
+
+    # This is where we place our extensions folder.
+    destination = os.path.join(
+        EXTENSIONS_DIRECTORY,
+        entry_point.name)
+
+    copy_tree(content_folder, destination)

bin/docker-entrypoint

@@ -3,7 +3,7 @@ set -e
 
 worker() {
   WORKERS_COUNT=${WORKERS_COUNT:-2}
-  QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
 
   echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
   exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
@@ -12,16 +12,25 @@ worker() {
 scheduler() {
   WORKERS_COUNT=${WORKERS_COUNT:-1}
   QUEUES=${QUEUES:-celery}
+  SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}
 
   echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
 
-  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
 }
 
 server() {
   exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app
 }
 
+create_db() {
+  exec /app/manage.py database create_tables
+}
+
+celery_healthcheck() {
+  exec /usr/local/bin/celery inspect ping --app=redash.worker -d celery@$HOSTNAME
+}
+
 help() {
   echo "Redash Docker."
   echo ""
@@ -31,16 +40,25 @@ help() {
   echo "server -- start Redash server (with gunicorn)"
   echo "worker -- start Celery worker"
   echo "scheduler -- start Celery worker with a beat (scheduler) process"
+  echo "celery_healthcheck -- runs a Celery healthcheck. Useful for Docker's HEALTHCHECK mechanism."
   echo ""
   echo "shell -- open shell"
   echo "dev_server -- start Flask development server with debugger and auto reload"
+  echo "debug -- start Flask development server with remote debugger via ptvsd"
   echo "create_db -- create database tables"
   echo "manage -- CLI to manage redash"
+  echo "tests -- run tests"
 }
 
 tests() {
   export REDASH_DATABASE_URL="postgresql://postgres@postgres/tests"
-  exec make test
+
+  if [ $# -eq 0 ]; then
+    TEST_ARGS=tests/
+  else
+    TEST_ARGS=$@
+  fi
+  exec pytest $TEST_ARGS
 }
 
 case "$1" in
@@ -57,22 +75,34 @@ case "$1" in
     scheduler
     ;;
   dev_server)
+    export FLASK_DEBUG=1
     exec /app/manage.py runserver --debugger --reload -h 0.0.0.0
     ;;
+  debug)
+    export FLASK_DEBUG=1
+    export REMOTE_DEBUG=1
+    exec /app/manage.py runserver --debugger --no-reload -h 0.0.0.0
+    ;;
   shell)
     exec /app/manage.py shell
     ;;
   create_db)
-    exec /app/manage.py database create_tables
+    create_db
     ;;
   manage)
     shift
     exec /app/manage.py $*
     ;;
   tests)
-    tests
+    shift
+    tests $@
     ;;
-  *)
+  help)
+    shift
     help
     ;;
+  *)
+    exec "$@"
+    ;;
 esac
+

bin/flake8_tests.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+flake8 --version ; pip --version
+# stop the build if there are Python syntax errors or undefined names
+flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+# exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide      
+flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics

bin/get_changes.py

@@ -0,0 +1,36 @@
+#!/bin/env python
+from __future__ import print_function
+import sys
+import re
+import subprocess
+
+def get_change_log(previous_sha):
+    args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', 'master...{}'.format(previous_sha)]
+    log = subprocess.check_output(args)
+    changes = []
+
+    for line in log.split('\n'):
+        try:
+            sha, subject, body, parents = line[1:-1].split('|')
+        except ValueError:
+            continue
+
+        try:
+            pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
+            pull_request = " #{}".format(pull_request)
+        except Exception as ex:
+            pull_request = ""
+
+        author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
+
+        changes.append("{}{}: {} ({})".format(sha, pull_request, body.strip(), author))
+
+    return changes
+
+
+if __name__ == '__main__':
+    previous_sha = sys.argv[1]
+    changes = get_change_log(previous_sha)
+
+    for change in changes:
+        print(change)

bin/pack

@@ -0,0 +1,8 @@
+#!/bin/bash
+NAME=redash
+VERSION=$(python ./manage.py version)
+FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
+FILENAME=$NAME.$FULL_VERSION.tar.gz
+
+sed -ri "s/^__version__ = '([A-Za-z0-9.-]*)'/__version__ = '$FULL_VERSION'/" redash/__init__.py
+tar -zcv -f $FILENAME --exclude="optipng*" --exclude=".git*" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" --exclude="node_modules" *

bin/release_manager.py

@@ -1,9 +1,10 @@
+from __future__ import print_function
 import os
 import sys
-import json
 import re
 import subprocess
 import requests
+import simplejson
 
 github_token = os.environ['GITHUB_TOKEN']
 auth = (github_token, 'x-oauth-basic')
@@ -16,7 +17,7 @@ def _github_request(method, path, params=None, headers={}):
         url = path
 
     if params is not None:
-        params = json.dumps(params)
+        params = simplejson.dumps(params)
 
     response = requests.request(method, url, data=params, auth=auth)
     return response
@@ -95,7 +96,7 @@ def get_changelog(commit_sha):
         try:
             pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
             pull_request = " #{}".format(pull_request)
-        except Exception, ex:
+        except Exception as ex:
             pull_request = ""
 
         author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
@@ -124,7 +125,7 @@ def update_release(version, build_filepath, commit_sha):
         else:
             release = create_release(version, commit_sha)
 
-        print "Using release id: {}".format(release['id'])
+        print("Using release id: {}".format(release['id']))
 
         remove_previous_builds(release)
         response = upload_asset(release, build_filepath)
@@ -135,8 +136,8 @@ def update_release(version, build_filepath, commit_sha):
         if response.status_code != 200:
             raise exception_from_error("Failed updating release description", response)
 
-    except Exception, ex:
-        print ex
+    except Exception as ex:
+        print(ex)
 
 if __name__ == '__main__':
     commit_sha = sys.argv[1]

bin/upgrade

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import urllib
 import argparse
 import os
 import subprocess
@@ -74,13 +75,13 @@ class Release(namedtuple('Release', ('version', 'download_url', 'filename', 'des
 
 
 def get_latest_release_from_ci():
-    response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts')
+    response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts?branch=master')
 
     if response.status_code != 200:
         exit("Failed getting releases (status code: %s)." % response.status_code)
 
     tarball_asset = filter(lambda asset: asset['url'].endswith('.tar.gz'), response.json())[0]
-    filename = tarball_asset['pretty_path'].replace('$CIRCLE_ARTIFACTS/', '')
+    filename = urllib.unquote(tarball_asset['pretty_path'].split('/')[-1])
     version = filename.replace('redash.', '').replace('.tar.gz', '')
 
     release = Release(version, tarball_asset['url'], filename, '')
@@ -203,7 +204,9 @@ def show_description_and_confirm(description):
 
 def verify_newer_version(release):
     if not release.is_newer(current_version()):
-        red("The found release is not newer than your current deployed release ({}). Aborting upgrade.".format(current_version()))
+        red("The found release is not newer than your current deployed release ({}).".format(current_version()))
+        if not confirm("Continue with upgrade?"):
+            red("Cancelling upgrade.")
             exit(1)
 
 

circle.yml

@@ -1,37 +0,0 @@
-machine:
-  services:
-    - docker
-    - redis
-  node:
-    version:
-      6.9.1
-dependencies:
-  override:
-    - pip install --upgrade setuptools
-    - pip install -r requirements_dev.txt
-    - pip install -r requirements.txt
-    - make deps
-  cache_directories:
-    - node_modules/
-test:
-  override:
-    - nosetests --with-xunit --xunit-file=$CIRCLE_TEST_REPORTS/junit.xml --with-coverage --cover-package=redash tests/
-deployment:
-  github_and_docker:
-    branch: master
-    commands:
-      - make pack
-      # Skipping uploads for now, until master is stable.
-      # - make upload
-      #- echo "client/app" >> .dockerignore
-      #- docker pull redash/redash:latest
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-      - docker build -t redash/redash:$(./manage.py version | sed -e "s/\+/./") .
-      - docker push redash/redash:$(./manage.py version | sed -e "s/\+/./")
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/895d09c3165a0913ac2f
-general:
-  branches:
-    ignore:
-      - gh-pages

client/.babelrc

@@ -1,4 +1,17 @@
 {
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-object-assign"]
+  "presets": [
+    ["@babel/preset-env", {
+      "targets": "> 0.5%, last 2 versions, Firefox ESR, ie 11, not dead",
+      "useBuiltIns": "usage"
+    }],
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    "angularjs-annotate",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-object-assign",
+    ["babel-plugin-transform-builtin-extend", {
+      "globals": ["Error"]
+    }]
+  ]
 }

client/.eslintignore

@@ -1,2 +1,3 @@
 build/*.js
 config/*.js
+node_modules

client/.eslintrc.js

@@ -1,15 +1,60 @@
 module.exports = {
   root: true,
-  extends: 'airbnb-base',
+  extends: ["airbnb", "plugin:jest/recommended"],
+  plugins: ["jest", "cypress"],
+  settings: {
+    "import/resolver": "webpack"
+  },
+  parser: "babel-eslint",
   env: {
+    "jest/globals": true,
+    "cypress/globals": true,
     "browser": true,
     "node": true
   },
   rules: {
     // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     'no-param-reassign': 0,
     'no-mixed-operators': 0,
     'no-underscore-dangle': 0,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+    "no-use-before-define": ["error", "nofunc"],
+    "prefer-destructuring": "off",
+    "prefer-template": "off",
+    "no-restricted-properties": "off",
+    "no-restricted-globals": "off",
+    "no-multi-assign": "off",
+    "no-lonely-if": "off",
+    "consistent-return": "off",
+    "no-control-regex": "off",
+    'no-multiple-empty-lines': 'warn',
+    "no-script-url": "off", // some <a> tags should have href="javascript:void(0)"
+    'operator-linebreak': 'off',
+    'react/destructuring-assignment': 'off',
+    "react/jsx-filename-extension": "off",
+    'react/jsx-one-expression-per-line': 'off',
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    'react/jsx-wrap-multilines': 'warn',
+    'react/no-access-state-in-setstate': 'warn',
+    "react/prefer-stateless-function": "warn",
+    "react/forbid-prop-types": "warn",
+    "react/prop-types": "warn",
+    "jsx-a11y/anchor-is-valid": "off",
+    "jsx-a11y/click-events-have-key-events": "off",
+    "jsx-a11y/label-has-associated-control": ["warn", {
+      "controlComponents": true
+    }],
+    "jsx-a11y/label-has-for": "off",
+    "jsx-a11y/no-static-element-interactions": "off",
+    "max-len": ['error', 120, 2, {
+      ignoreUrls: true,
+      ignoreComments: false,
+      ignoreRegExpLiterals: true,
+      ignoreStrings: true,
+      ignoreTemplateLiterals: true,
+    }],
+    "no-else-return": ["error", {"allowElseIf": true}],
+    "object-curly-newline": ["error", {"consistent": true}],
   }
-}
+};

client/app/__tests__/enzyme_setup.js

@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new Adapter() });

client/app/__tests__/mocks.js

@@ -0,0 +1,5 @@
+import MockDate from 'mockdate';
+
+const date = new Date('2000-01-01T02:00:00.000');
+
+MockDate.set(date);

client/app/assets/css/redash.css

@@ -1,704 +0,0 @@
-body {
-  padding-top: 50px;
-}
-
-body.headless {
-  padding-top: 0px;
-  padding-bottom: 0px;
-}
-
-body.headless nav.app-header {
-  display: none;
-}
-
-body.headless div#footer {
-  display: none;
-}
-
-a[ng-click] {
-  cursor: pointer;
-}
-
-a.link {
-  cursor: pointer;
-}
-
-a.page-title {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 400px;
-}
-
-a.navbar-brand {
-  padding: 5px 5px 0px 0px;
-  margin-left: 0px !important;
-}
-
-.navbar .fa {
-  font-size: 18px;
-}
-
-a.navbar-brand img {
-  height: 40px;
-}
-
-.avatar {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-.avatar img {
-  width: 40px;
-  height: 40px;
-}
-
-#logout {
-  color: white;
-  position: relative;
-  left: -9px;
-  bottom: -11px;
-}
-
-.details-toggle {
-  cursor: pointer;
-}
-
-.details-toggle::before {
-  content: '▸';
-  margin-right: 5px;
-}
-
-.details-toggle.open::before {
-  content: '▾';
-  margin-right: 5px;
-}
-
-.edit-in-place span {
-  white-space: pre-line;
-}
-
-.edit-in-place span.editable {
-  cursor: pointer;
-}
-
-.edit-in-place span.editable:hover {
-  background: #FCFCA2;
-}
-
-.edit-in-place input,
-.edit-in-place textarea {
-  display: none;
-}
-
-.edit-in-place.active span {
-  display: none;
-}
-
-.edit-in-place.active input,
-.edit-in-place.active textarea {
-  display: inline-block;
-}
-
-.delete-button {
-  float: none !important;
-}
-
-.list-group-item.active button {
-  color: white;
-}
-
-.panel-heading > p:last-child {
-  margin-bottom: 0px;
-}
-
-.panel-heading > a,
-.panel-heading .query-link {
-  color: inherit;
-}
-
-.panel-heading .query-link:hover {
-  text-decoration: underline;
-}
-
-.form-group.required .control-label:after {
-  content: "*";
-  color: red;
-}
-
-.form-group .help-block.error {
-  display: none;
-}
-
-.form-group.has-error .help-block.error {
-  display: block;
-}
-
-/* angular-growl */
-.growl {
-  position: fixed;
-  bottom: 10px;
-  right: 10px;
-  float: right;
-  width: 250px;
-  z-index: 10000;
-}
-
-.growl-item.ng-enter,
-.growl-item.ng-leave {
-  -webkit-transition: 0.5s linear all;
-  -moz-transition: 0.5s linear all;
-  -o-transition: 0.5s linear all;
-  transition: 0.5s linear all;
-}
-
-.growl-item.ng-enter,
-.growl-item.ng-leave.ng-leave-active {
-  opacity: 0;
-}
-
-.growl-item.ng-leave,
-.growl-item.ng-enter.ng-enter-active {
-  opacity: 1;
-
-}
-
-/* Gridster */
-
-li.widget {
-  /*background-color:grey;*/
-  border-width: 1px;
-  border-style: solid;
-  border-color: grey;
-  opacity: 0.7;
-  cursor: move;
-}
-
-li.widget:hover {
-  opacity: 1.0 !important;
-
-  -webkit-transition: opacity .6s;
-  -moz-transition: opacity .6s;
-  -o-transition: opacity .6s;
-  -ms-transition: opacity .6s;
-  transition: opacity .6s;
-}
-
-.gridster .preview-holder {
-  border: none !important;
-  border-radius: 0 !important;
-  background: rgba(0, 0, 0, 0.5) !important;
-}
-
-.gridster li .heading {
-  border: #ddd;
-  background-color: #f5f5f5;
-  padding: 5px;
-}
-
-/* Editor */
-
-.ace_editor {
-  border: 1px solid #eee;
-  height: 100%;
-  margin-bottom: 10px;
-}
-
-/* Support for Font-Awesome in btn-xs */
-
-.btn-xs > .fa {
-  font-size: 14px;
-  top: 1px;
-  position: relative;
-}
-
-/* Because of ng-repeat we add span between the .dropdown-menu element and the li element, so we had
-to add those CSS styles here. */
-
-.dropdown-menu > span > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 1.428571429;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu > span > li > a:hover,
-.dropdown-menu > span > li > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #428bca;
-}
-
-/* Dropdown submenus */
-.dropdown-submenu {
-  position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-  -moz-border-radius: 0 6px 6px 6px;
-  border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: #cccccc;
-  margin-top: 5px;
-  margin-right: -10px;
-}
-
-.dropdown-submenu:hover > a:after {
-  /*border-left-color: #ffffff;*/
-}
-
-.dropdown-submenu.pull-left {
-  float: none;
-}
-
-.dropdown-submenu.pull-left > .dropdown-menu {
-  left: -100%;
-  margin-left: 10px;
-  -webkit-border-radius: 6px 0 6px 6px;
-  -moz-border-radius: 6px 0 6px 6px;
-  border-radius: 6px 0 6px 6px;
-}
-
-.rd-tab .remove {
-  cursor: pointer;
-  color: #A09797;
-  padding: 0 3px 1px 4px;
-  font-size: 11px;
-}
-
-.rd-tab .remove:hover {
-  color: white;
-  background-color: #FF8080;
-  border-radius: 50%;
-}
-
-.tab-nav > li.rd-tab-btn {
-  float: right;
-  padding-right: 10px;
-  padding-top: 10px;
-}
-
-/* light version of bootstrap's form-control */
-.rd-form-control {
-  display: block;
-  padding: 6px 12px;
-  line-height: 1.428571429;
-  color: #555555;
-  vertical-align: middle;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border-radius: 4px;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-}
-
-.rd-form-control {
-  width: 90%;
-}
-
-pivot-table-renderer > table, grid-renderer > div, visualization-renderer > div {
-  overflow: auto;
-}
-
-counter-renderer {
-  display: block;
-  text-align: center;
-}
-
-counter-renderer counter {
-  margin: 0 auto;
-  padding: 15px 50px;
-  display: block;;
-}
-
-counter-renderer value,
-counter-renderer counter-target {
-  font-size: 80px;
-  display: block;
-}
-
-counter-renderer counter-target {
-  color: #ccc;
-}
-
-counter-renderer counter.positive value {
-  color: #5cb85c;
-}
-
-counter-renderer counter.negative value {
-  color: #d9534f;
-  margin-right: 15px;
-}
-
-counter-renderer counter-name {
-  font-size: 40px;
-  display: block;
-}
-
-.box {
-  font: 10px sans-serif;
-}
-
-.box line,
-.box rect,
-.box circle {
-  fill: #fff;
-  stroke: #000;
-  stroke-width: 1.5px;
-}
-
-.box .center {
-  stroke-dasharray: 3, 3;
-}
-
-.box .outlier {
-  fill: none;
-  stroke: #000;
-}
-
-.axis text {
-  font: 10px sans-serif;
-}
-
-.axis path,
-.axis line {
-  fill: none;
-  stroke: #000;
-  shape-rendering: crispEdges;
-}
-
-.grid-background {
-  fill: #ddd;
-}
-
-.grid path,
-.grid line {
-  fill: none;
-  stroke: #fff;
-  shape-rendering: crispEdges;
-}
-
-.grid .minor line {
-  stroke-opacity: .5;
-}
-
-.grid text {
-  display: none;
-}
-
-.iframe-container {
-  height: 100%;
-}
-
-.schema-container {
-  height: 100%;
-  z-index: 10;
-  background-color: white;
-}
-
-.schema-control {
-  display: flex;
-  padding: 5px 0;
-}
-
-.schema-control .form-control {
-  height: 30px;
-  margin-right: 5px;
-}
-
-.schema-browser {
-  height: calc(100% - 45px);
-  overflow-y: auto;
-  overflow-x: hidden;
-  border: 1px solid rgba(0,0,0,.15);
-}
-
-.parameter-label {
-  display: block;
-}
-
-div.table-name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
-  padding: 0 10px;
-}
-
-div.table-name:hover {
-  background: #f4f4f4;
-}
-
-.blankslate {
-  text-align: center;
-  padding: 30px;
-}
-
-/* Footer */
-
-.footer {
-  color: #818d9f;
-  padding-bottom: 30px;
-}
-
-.footer a {
-  color: #818d9f;
-  margin-left: 20px;
-}
-
-.col-table .missing-value {
-  color: #b94a48;
-}
-
-.col-table .super-small-input {
-  padding-left: 3px;
-  height: 24px;
-}
-
-.col-table .ui-select-toggle, .col-table .ui-select-search {
-  padding: 2px;
-  padding-left: 5px;
-  height: 24px;
-}
-
-.clearable button {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-/* Immediately apply ng-cloak, instead of waiting for angular.js to load: */
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-  display: none !important;
-}
-
-.voffset {
-  margin-top: 2px;
-}
-
-.voffset1 {
-  margin-top: 5px;
-}
-
-.voffset2 {
-  margin-top: 10px;
-}
-
-.voffset3 {
-  margin-top: 15px;
-}
-
-.voffset4 {
-  margin-top: 30px;
-}
-
-.voffset5 {
-  margin-top: 40px;
-}
-
-.voffset6 {
-  margin-top: 60px;
-}
-
-.voffset7 {
-  margin-top: 80px;
-}
-
-.voffset8 {
-  margin-top: 100px;
-}
-
-.voffset9 {
-  margin-top: 150px;
-}
-
-.overlay {
-  background-color: #808080;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 0;
-  z-index: 1000;
-  opacity: 0.8;
-}
-
-.container-fluid {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-.modal-xl {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: hidden;
-}
-.modal-xl .modal-dialog {
-  position: fixed;
-  margin: 0;
-  width: 100%;
-  height: 100%;
-  padding: 0;
-}
-
-.modal-xl .modal-content {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  border: 2px solid #3c7dcf;
-  border-radius: 0;
-  box-shadow: none;
-}
-
-.modal-xl .modal-header {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  height: 50px;
-  padding: 10px;
-  border: 0;
-}
-
-.modal-xl .modal-body {
-  position: absolute;
-  top: 50px;
-  bottom: 60px;
-  width: 100%;
-  overflow: auto;
-}
-
-.modal-xl .modal-footer {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  height: 60px;
-  padding: 10px;
-}
-
-/* Bootstrap Overrides */
-
-.flex-parent {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.collapsing,
-.collapse.in {
-  padding: 5px 10px;
-  transition: all 0.35s ease;
-}
-
-.schema-browser .collapse.in {
-  background: #f4f4f4;
-}
-
-.navbar .collapse.in {
-  background: #222;
-}
-
-/* Fixes for SuperFlat */
-
-.table-hover > tbody > tr:hover {
-  background-color: #f4f4f4;
-}
-
-.dropdown-menu {
-  z-index: 1000000000;
-}
-
-
-.t-body a.actions {
-  font-size: 24px;
-  line-height: 100%;
-  padding: 4px 10px 3px;
-  display: block;
-}
-
-.t-body a.actions:hover,
-.t-body a.actions.open > a {
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-/* ui-select adjustments for SuperFlat */
-
-/* Same definition as .form-control */
-.ui-select-toggle.btn-default {
-  height: 35px;
-  padding: 6px 12px;
-  font-size: 13px;
-  line-height: 1.42857143;
-  color: #9E9E9E;
-  background: #fff none;
-  border: 1px solid #e8e8e8;
-  border-radius: 5px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-
-.t-header.widget {
-  padding: 5px;
-}
-
-/* Sankey Visualization */
-.sankey .node rect {
-    fill-opacity: .9;
-    shape-rendering: crispEdges;
-    stroke-width: 0;
-}
-.sankey .node text {
-    text-shadow: 0 1px 0 #fff;
-}
-.sankey .link {
-    fill: none;
-    stroke: #000;
-    stroke-opacity: .2;
-}
-
-/*Dashboard list view */
-.m-2{
-  margin:2px;
-}
-
-.dropdown-menu > .disabled{
- cursor: not-allowed;
-}
-
-/* The real magic ;) */
-.dropdown-menu > .disabled > a{
- pointer-events: none;
-}

client/app/assets/images/avatar.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="630" height="630" viewBox="0 0 630 630" version="1.1">
+  <g transform="translate(-56.611934,-184.36221)">
+    <path fill="#a7a7a7" d="m 58.467329,810.92426 c 0,-10.37237 6.53079,-28.55017 15.29935,-42.58418 9.70782,-15.53729 28.965401,-35.11964 51.655121,-52.52627 7.21357,-5.53395 6.57284,-5.08564 22.23877,-15.56023 20.2393,-13.53245 55.34935,-32.58361 79.80676,-43.30416 19.72995,-8.64834 57.2268,-21.58721 62.55974,-21.58721 0.76988,0 3.09659,-0.67892 5.17046,-1.50872 7.3197,-2.92876 12.5713,-16.1286 13.89202,-34.91737 l 0.64689,-9.20257 -8.38455,-10.04931 c -7.66622,-9.18836 -11.59308,-14.62897 -20.80286,-28.82203 -9.85543,-15.1881 -22.91997,-47.26171 -24.69185,-60.61889 -0.56037,-4.22429 -1.0976,-5.21546 -3.27999,-6.05157 -10.15146,-3.88918 -15.7489,-9.08881 -20.96084,-19.47118 -6.6162,-13.17971 -8.62087,-36.5618 -4.2711,-49.81738 2.29242,-6.98599 4.4873,-10.89589 8.72413,-15.54098 2.11744,-2.32146 2.22102,-2.9999 1.45041,-9.5 -2.58899,-21.83821 -3.34954,-41.36055 -2.18394,-56.05862 3.87891,-48.91259 20.17112,-81.47548 50.89033,-101.71339 16.68129,-10.98968 34.4196,-16.74492 62.2113,-20.1846 32.20647,-3.98609 68.82401,0.75436 93.8318,12.14731 14.67849,6.68717 28.98155,17.91433 38.99893,30.61215 19.81832,25.12131 29.57328,66.42856 26.24603,111.13853 -0.69821,9.38224 -1.63714,20.17477 -2.08651,23.9834 -0.81425,6.90129 -0.80559,6.93815 2.55469,10.86388 7.03777,8.22205 10.02312,18.44949 9.84447,33.72599 -0.27308,23.35114 -10.37432,43.49379 -24.44339,48.74202 l -5.34465,1.99373 -1.18738,6.3748 c -4.9831,26.75313 -22.71761,61.14702 -45.76986,88.76506 l -7.88572,9.44759 0.64805,9.21931 c 1.18682,16.88381 6.49256,31.6953 12.30203,34.34227 1.23595,0.56314 6.42637,1.99946 11.53427,3.19182 35.45428,8.27628 97.76078,37.16683 137.59386,63.80012 15.66594,10.47459 15.02521,10.02628 22.23877,15.56023 22.46534,17.23449 41.43241,36.56563 52.11597,53.1163 7.31528,11.33263 13.49882,27.98884 14.54335,39.17447 l 0.58435,6.25763 -313.14461,0 -313.144601,0 0,-3.43795 z"/>
+  </g>
+</svg>

client/app/assets/images/google_logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>

client/app/assets/images/illustrations/alert.svg

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="844px" height="561px" viewBox="0 0 844 561" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
+    <title>alert</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M16.1038207,9.60213053 C11.5200489,10.2779745 8.52171196,12.444141 6.39769565,16.0301575 C8.22444293,8.88931733 9.90197283,2.94073518 8.3864837,0.0421155289 C-3.90646467,5.86130533 1.23687228,25.24012 0.672644022,34.6950038 L0.9384375,34.7227307 C1.78827717,26.9072018 17.6985815,15.7205401 16.1038207,9.60213053 Z" id="path-1"></path>
+        <path d="M16.1038207,9.60213053 C11.5200489,10.2779745 8.52171196,12.444141 6.39769565,16.0301575 C8.22444293,8.88931733 9.90197283,2.94073518 8.3864837,0.0421155289 C-3.90646467,5.86130533 1.23687228,25.24012 0.672644022,34.6950038 L0.9384375,34.7227307 C1.78827717,26.9072018 17.6985815,15.7205401 16.1038207,9.60213053 Z" id="path-3"></path>
+    </defs>
+    <g id="alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Layer_3" transform="translate(165.000000, 26.000000)">
+            <path d="M457.831075,86.1467907 C448.970378,84.9675232 425.223707,91.0761286 411.514436,97.9182384 L19.0505003,294.681371 C7.37564487,300.508132 0,312.419912 0,325.450818 L0,431.514132 C0,444.543858 7.37564487,456.45446 19.0505003,462.282399 C78.8298874,481.970662 117.580279,494.762963 135.301674,500.6593 C161.883768,509.503806 184.667576,507.883492 198.380392,507.883492 L362.910555,507.883492 C376.621008,507.883492 397.189641,506.366954 414.326231,496.101431 C455.932284,478.305658 485.639644,463.479122 503.448311,451.621822 C511.961503,445.953599 516.523558,436.335266 514.539542,423.417282 C509.25454,389.006494 478.348459,113.067594 474.961758,101.477268 C471.575057,89.8869406 466.691773,87.3260581 457.831075,86.1467907 Z" id="Shape-Copy-4" fill="#7F5949" fill-rule="nonzero"></path>
+            <path d="M457.831075,74.1467907 C448.970378,72.9675232 425.223707,79.0761286 411.514436,85.9182384 L19.0505003,282.681371 C7.37564487,288.508132 0,300.419912 0,313.450818 L0,419.514132 C0,432.543858 7.37564487,444.45446 19.0505003,450.282399 C78.8298874,469.970662 117.580279,482.762963 135.301674,488.6593 C161.883768,497.503806 184.667576,495.883492 198.380392,495.883492 L362.910555,495.883492 C376.621008,495.883492 397.189641,494.366954 414.326231,484.101431 C455.932284,466.305658 485.639644,451.479122 503.448311,439.621822 C511.961503,433.953599 516.523558,424.335266 514.539542,411.417282 C509.25454,377.006494 478.348459,101.067594 474.961758,89.4772675 C471.575057,77.8869406 466.691773,75.3260581 457.831075,74.1467907 Z" id="Shape-Copy-3" fill="#6D9E3E" fill-rule="nonzero"></path>
+            <path d="M457.831075,63.1467907 C448.970378,61.9675232 425.223707,68.0761286 411.514436,74.9182384 L19.0505003,271.681371 C7.37564487,277.508132 0,289.419912 0,302.450818 L0,408.514132 C0,421.543858 7.37564487,433.45446 19.0505003,439.282399 C78.8298874,458.970662 117.580279,471.762963 135.301674,477.6593 C161.883768,486.503806 184.667576,484.883492 198.380392,484.883492 L362.910555,484.883492 C376.621008,484.883492 397.189641,483.366954 414.326231,473.101431 C455.932284,455.305658 485.639644,440.479122 503.448311,428.621822 C511.961503,422.953599 516.523558,413.335266 514.539542,400.417282 C509.25454,366.006494 478.348459,90.0675945 474.961758,78.4772675 C471.575057,66.8869406 466.691773,64.3260581 457.831075,63.1467907 Z" id="Shape" fill="#94C36C" fill-rule="nonzero"></path>
+            <g id="Group" transform="translate(376.000000, 299.000000)" fill-rule="nonzero">
+                <path d="M25.9420909,61.1810309 C30.4314545,62.1896907 35.2677273,64.5435052 35.9590909,69.2494845 C35.9590909,69.5868041 31.8141818,75.3030928 31.4689091,75.974433 C27.324,81.3542268 18.6880909,80.3463918 13.5065455,77.6560825 C9.70690909,75.6387629 5.562,75.302268 1.41709091,73.6206186 C-1.34590909,72.6119588 2.45372727,65.5513402 5.90727273,64.5426804 C9.70690909,63.5331959 11.7793636,60.8437113 15.579,61.5158763" id="Shape" fill="#E5C19E"></path>
+                <path d="M25.9429091,74.9657732 C23.5955455,75.8441237 21.1066364,76.3117526 18.6880909,76.3117526 C16.2703636,76.3117526 14.8876364,75.974433 13.1620909,74.6301031 C11.4349091,73.2849485 8.32581818,72.6127835 7.63445455,70.9319588 C6.94390909,69.2503093 5.21672727,68.2408247 6.94390909,66.56 C8.67027273,64.8791753 14.1979091,60.1715464 16.2695455,59.1628866 C18.3428182,58.1534021 17.6506364,57.4820619 21.105,58.4898969 C24.5601818,59.4993814 25.5951818,60.0461856 26.631,62.4 C27.6684545,64.7538144 34.9224545,71.6041237 25.9429091,74.9657732 Z" id="Shape" fill="#603E2F"></path>
+                <path d="M22.3011818,3.24948454 C22.3011818,3.24948454 22.1481818,4.16329897 21.9493636,5.7756701 C21.8495455,6.58061856 21.7300909,7.55876289 21.6278182,8.68371134 C21.5050909,9.80783505 21.4044545,11.0787629 21.3054545,12.4668041 C21.1835455,13.8540206 21.1352727,15.3608247 21.0534545,16.9534021 C21.0035455,17.7501031 20.9953636,18.5690722 20.9888182,19.4061856 C20.9781818,20.2449485 20.9675455,21.1010309 20.9577273,21.9703093 C20.9585455,23.7113402 21.0272727,25.5101031 21.06,27.3393814 C21.0853636,29.1579381 21.1115455,31.0045361 21.1377273,32.8527835 C21.0845455,34.691134 21.0305455,36.5319588 20.9781818,38.342268 C20.8849091,40.1575258 20.7932727,41.942268 20.7057273,43.6709278 C20.6402727,45.4004124 20.5363636,47.0713402 20.4946364,48.6589691 C20.4340909,50.2465979 19.0096364,61.3369072 18.9891818,62.1468041 C18.8599091,63.785567 20.2851818,63.1554639 20.3563636,61.7501031 C20.4414545,61.3212371 20.5347273,60.691134 20.6697273,59.8878351 C20.8088182,59.0870103 20.9503636,58.1113402 21.1017273,56.988866 C21.2539091,55.868866 21.4232727,54.6020619 21.5631818,53.2189691 C21.7112727,51.8342268 21.8830909,50.3364948 21.9951818,48.7447423 C22.1211818,47.1546392 22.2529091,45.4787629 22.3216364,43.7402062 C22.3617273,41.9991753 22.4288182,40.2028866 22.4320909,38.3727835 C22.4149091,36.5393814 22.3969091,34.6771134 22.3805455,32.8148454 C22.2954545,30.9616495 22.2111818,29.1076289 22.1260909,27.2824742 C22.0369091,25.4705155 21.9117273,23.6865979 21.8560909,21.9571134 C21.834,20.2268041 21.7669091,18.5542268 21.7849091,16.9674227 C21.8004545,15.3797938 21.7824545,13.8787629 21.8462727,12.4931959 C21.8863636,11.1068041 21.933,9.83670103 22.0090909,8.71340206 C22.0655455,7.58680412 22.1424545,6.60783505 22.2087273,5.80123711 C22.338,4.18886598 22.4517273,3.27010309 22.4517273,3.27010309 C22.4566364,3.22804124 22.4263636,3.19092784 22.3838182,3.18597938 C22.3453636,3.18103093 22.3077273,3.21072165 22.3011818,3.24948454 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M33.9136364,29.2816495 C33.9136364,29.2816495 33.0234545,29.9035052 31.7454545,30.9096907 C30.4731818,31.9216495 28.7852727,33.28 27.2405455,34.7818557 C26.8576364,35.1604124 26.469,35.5323711 26.1204545,35.9290722 C25.7612727,36.316701 25.4078182,36.694433 25.0879091,37.0771134 C24.7393636,37.436701 24.4333636,37.8037113 24.129,38.1426804 C23.8131818,38.4750515 23.562,38.8181443 23.31,39.1249485 C23.0465455,39.4276289 22.8518182,39.7286598 22.6693636,39.996701 C22.4779091,40.2597938 22.3142727,40.4940206 22.2136364,40.7026804 C21.9935455,41.1134021 21.8454545,41.3558763 21.8454545,41.3558763 L21.8405455,41.3641237 C21.825,41.3872165 21.7939091,41.3954639 21.7701818,41.3806186 C21.753,41.3698969 21.744,41.3501031 21.7464545,41.3303093 C21.7464545,41.3303093 21.7808182,41.0589691 21.8806364,40.5715464 C21.9109091,40.3175258 22.0090909,40.0362887 22.1408182,39.7195876 C22.2676364,39.3987629 22.4059091,39.0276289 22.6300909,38.6721649 C22.8379091,38.3051546 23.0620909,37.9002062 23.3582727,37.5241237 C23.6348182,37.1290722 23.9465455,36.7282474 24.3057273,36.3529897 C24.6616364,35.9719588 25.0396364,35.5925773 25.4536364,35.2395876 C25.8545455,34.8725773 26.2759091,34.5195876 26.6980909,34.1682474 C28.3819091,32.7579381 30.1581818,31.4894845 31.5400909,30.614433 C32.913,29.7303093 33.8596364,29.1934021 33.8596364,29.1934021 C33.8841818,29.1793814 33.9152727,29.1876289 33.9291818,29.2123711 C33.9422727,29.2371134 33.9349091,29.2659794 33.9136364,29.2816495 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M15.1003636,12.7298969 C15.1003636,12.7298969 15.6976364,13.4037113 16.5305455,14.4701031 C17.3724545,15.5298969 18.4000909,17.0185567 19.3270909,18.5839175 C19.5700909,18.9690722 19.7779091,19.3756701 20.0045455,19.7649485 C20.2336364,20.1534021 20.4087273,20.5641237 20.5993636,20.9501031 C20.7638182,21.3484536 20.8963636,21.7476289 21.0133636,22.1253608 C21.1205455,22.508866 21.1982727,22.88 21.2694545,23.2189691 C21.3340909,23.5604124 21.3512727,23.8861856 21.3799091,24.1657732 C21.4134545,24.4445361 21.3962727,24.697732 21.3815455,24.9014433 C21.3619091,25.308866 21.33,25.5364948 21.33,25.5364948 C21.3259091,25.5645361 21.2997273,25.5851546 21.2710909,25.5810309 C21.2522727,25.5785567 21.2375455,25.5653608 21.2301818,25.548866 L21.2277273,25.5430928 C21.2277273,25.5430928 21.1418182,25.3228866 21.0256364,24.9492784 C20.916,24.5756701 20.7065455,24.0560825 20.4848182,23.4408247 C20.3514545,23.1373196 20.2262727,22.8049485 20.0855455,22.457732 C19.9227273,22.1162887 19.782,21.7468041 19.6224545,21.3674227 C19.3107273,20.6053608 19.0006364,19.7740206 18.6111818,18.9748454 C17.8453636,17.3698969 16.9330909,15.8292784 16.2400909,14.6771134 C15.5380909,13.5307216 15.0226364,12.7958763 15.0226364,12.7958763 C15.0062727,12.7727835 15.0111818,12.7406186 15.0349091,12.7241237 C15.0537273,12.7068041 15.084,12.7109278 15.1003636,12.7298969 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M24.5601818,0.403298969 C24.5601818,0.403298969 21.726,0.862680412 22.4345455,3.39051546 C22.4345455,3.39051546 24.0856364,3.6214433 24.5601818,0.403298969 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M24.0414545,14.3991753 C24.0414545,14.3991753 21.2080909,14.8602062 21.9166364,17.3872165 C21.9166364,17.3872165 23.5685455,17.6164948 24.0414545,14.3991753 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M18.6447273,9.75092784 C18.6447273,9.75092784 18.5743636,12.5459794 21.258,12.345567 C21.258,12.3463918 21.8020909,10.8090722 18.6447273,9.75092784 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M26.7790909,4.55835052 C26.7790909,4.55835052 22.7282727,3.46886598 22.068,7.24865979 C22.0688182,7.24865979 24.1159091,8.5443299 26.7790909,4.55835052 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M25.3521818,21.4639175 C25.3521818,21.4639175 21.2056364,22.131134 22.2357273,25.8301031 C22.2365455,25.8301031 24.6526364,26.1707216 25.3521818,21.4639175 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M12.7914545,19.1661856 C12.7914545,19.1661856 15.8498182,21.971134 18.2479091,18.9303093 C18.2479091,18.9303093 17.0599091,16.8536082 12.7914545,19.1661856 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M15.7647273,27.9694845 C15.7647273,27.9694845 17.694,32.3901031 21.2596364,33.0507216 C21.2588182,33.0507216 21.5967273,29.0160825 15.7647273,27.9694845 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M11.4913636,9.29484536 C11.4913636,9.29484536 12.159,14.1039175 15.2967273,12.8420619 C15.2967273,12.8412371 15.5299091,10.025567 11.4913636,9.29484536 Z" id="Shape" fill="#D3FF8D"></path>
+            </g>
+            <g id="Group" transform="translate(416.000000, 309.000000)" fill-rule="nonzero">
+                <path d="M10.8245455,61.6261224 C6.48818182,62.6377959 1.818,64.9958878 1.15118182,69.7137245 C1.15118182,70.0501224 5.15536364,75.7796327 5.48836364,76.4532551 C9.49172727,81.8438878 17.8298182,80.8338673 22.833,78.1377245 C26.5017273,76.1160306 30.5059091,75.7788061 34.5084545,74.0943367 C37.1773636,73.0826633 33.5078182,66.0067347 30.1720909,64.9950612 C26.5041818,63.9842143 24.5012727,61.288898 20.8317273,61.9625204" id="Shape" fill="#E5C19E"></path>
+                <path d="M10.8245455,75.4415816 C13.0917273,76.3210102 15.4939091,76.7888265 17.8298182,76.7888265 C20.1657273,76.7888265 21.4985455,76.451602 23.1668182,75.1035306 C24.8334545,73.7562857 27.8361818,73.0818367 28.503,71.3973673 C29.1698182,69.712898 30.8380909,68.7012245 29.1698182,67.0175816 C27.5023636,65.3322857 22.1645455,60.614449 20.1640909,59.603602 C18.1628182,58.5927551 18.8296364,57.9183061 15.4939091,58.9299796 C12.1573636,59.9408265 11.1567273,60.4896429 10.1577273,62.8477347 C9.15709091,65.2074796 2.15263636,72.0718163 10.8245455,75.4415816 Z" id="Shape" fill="#603E2F"></path>
+                <path d="M14.3410909,3.56978571 C14.3410909,3.56978571 14.4883636,4.48558163 14.679,6.10144898 C14.7763636,6.90896939 14.8917273,7.88840816 14.9907273,9.01579592 C15.1101818,10.1423571 15.2067273,11.4152143 15.3024545,12.8079184 C15.4202727,14.1973163 15.4652727,15.7073878 15.5446364,17.3025918 C15.5929091,18.1018469 15.6010909,18.9225918 15.6084545,19.7623469 C15.6182727,20.602102 15.6272727,21.4592143 15.6370909,22.3303776 C15.6370909,24.0751837 15.5708182,25.8786735 15.5389091,27.7119184 C15.5143636,29.5344184 15.4881818,31.3850204 15.4628182,33.2372755 C15.5151818,35.0804388 15.5667273,36.9244286 15.6174545,38.7394898 C15.7066364,40.5570306 15.7966364,42.3464694 15.8809091,44.0788776 C15.9430909,45.8121122 16.0445455,47.4866633 16.0838182,49.0777347 C16.1419091,50.6688061 17.5189091,61.7831633 17.5369091,62.5948163 C17.6620909,64.2379592 16.2859091,63.6064898 16.2171818,62.1972551 C16.1345455,61.7674592 16.0453636,61.1359898 15.9152727,60.330949 C15.7802727,59.5275612 15.6444545,58.5497755 15.4971818,57.4256939 C15.3499091,56.3032653 15.1870909,55.0345408 15.0512727,53.6476224 C14.9080909,52.2607041 14.7428182,50.758898 14.634,49.1645204 C14.5120909,47.5709694 14.3844545,45.8906327 14.3173636,44.1474796 C14.2780909,42.4035 14.2142727,40.6041429 14.211,38.7700714 C14.2281818,36.9318673 14.2445455,35.0655612 14.2625455,33.1992551 C14.3435455,31.3412143 14.4253636,29.484 14.5071818,27.6557143 C14.5922727,25.839 14.7125455,24.0512143 14.7665455,22.3179796 C14.7878182,20.5847449 14.8524545,18.9077143 14.8369091,17.3166429 C14.8213636,15.7272245 14.8377273,14.2212857 14.7763636,12.8327143 C14.7379091,11.4449694 14.6912727,10.1712857 14.6192727,9.04472449 C14.5660909,7.91733673 14.4916364,6.93541837 14.427,6.12707143 C14.3026364,4.51120408 14.1921818,3.59044898 14.1921818,3.59044898 C14.1872727,3.54829592 14.2159091,3.51110204 14.2576364,3.50614286 C14.2985455,3.50118367 14.3353636,3.53011224 14.3410909,3.56978571 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M3.18109091,29.5724388 C3.18109091,29.5724388 4.10318182,30.1146429 5.43845455,31.008949 C6.78190909,31.8925102 8.50581818,33.1744592 10.134,34.5927857 C10.5439091,34.9457143 10.9497273,35.301949 11.3375455,35.6714082 C11.7384545,36.0251633 12.1025455,36.4086735 12.4453636,36.7897041 C12.7922727,37.164949 13.0884545,37.5682959 13.3543636,37.9600714 C13.6399091,38.3344898 13.8485455,38.7403163 14.049,39.1031633 C14.2633636,39.4560918 14.3893636,39.8272041 14.5104545,40.1421122 C14.5685455,40.3008061 14.6233636,40.4487551 14.6732727,40.5859592 C14.7133636,40.7272959 14.7289091,40.8661531 14.7542727,40.9851735 C14.8467273,41.4653878 14.877,41.7331837 14.877,41.7331837 C14.8802727,41.7604592 14.8598182,41.7852551 14.8328182,41.7885612 C14.8123636,41.7910408 14.7935455,41.7811224 14.7837273,41.7645918 L14.7788182,41.7571531 C14.7788182,41.7571531 14.6356364,41.5174592 14.4229091,41.1091531 C14.3255455,40.9025204 14.1725455,40.6686122 13.9868182,40.4057755 C13.8084545,40.1412857 13.6268182,39.8387755 13.3715455,39.5362653 C13.1260909,39.230449 12.8896364,38.8857857 12.5844545,38.5526939 C12.2890909,38.2154694 11.9986364,37.8460102 11.6623636,37.4856429 C11.3530909,37.1037857 11.016,36.7235816 10.6690909,36.3367653 C10.3328182,35.9400306 9.95972727,35.5647857 9.58909091,35.1862347 C8.09836364,33.6802959 6.46363636,32.3107347 5.22981818,31.294102 C3.98945455,30.281602 3.12545455,29.6559184 3.12545455,29.6559184 C3.10336364,29.6393878 3.09763636,29.6079796 3.11318182,29.5856633 C3.12954545,29.5658265 3.159,29.5600408 3.18109091,29.5724388 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M21.3733636,13.1335714 C21.3733636,13.1335714 20.8742727,13.8741429 20.1943636,15.0255 C19.5242727,16.1818163 18.6422727,17.7299082 17.9050909,19.3391633 C17.5295455,20.140898 17.2325455,20.9723878 16.9322727,21.734449 C16.7800909,22.1146531 16.6434545,22.4841122 16.4855455,22.8262959 C16.3521818,23.1759184 16.2294545,23.5065306 16.1001818,23.8106939 C15.8858182,24.4256327 15.6829091,24.9446939 15.5757273,25.3174592 C15.4628182,25.691051 15.3785455,25.9100816 15.3785455,25.9100816 L15.3769091,25.9150408 C15.3662727,25.9414898 15.3368182,25.9547143 15.3114545,25.9447959 C15.2934545,25.9373571 15.282,25.9216531 15.2795455,25.9034694 C15.2795455,25.9034694 15.2476364,25.6778265 15.2271818,25.2728265 C15.2124545,25.0695 15.1936364,24.8190612 15.2247273,24.5413469 C15.2517273,24.2628061 15.2680909,23.9396327 15.3278182,23.599102 C15.3940909,23.261051 15.4693636,22.8932449 15.57,22.5097347 C15.6812727,22.1320102 15.8097273,21.734449 15.9668182,21.3360612 C16.1500909,20.9492449 16.3194545,20.5401122 16.5387273,20.1491633 C16.7604545,19.7598673 16.9592727,19.3515612 17.1940909,18.9647449 C18.09,17.3926837 19.0857273,15.8941837 19.9039091,14.8254796 C20.7130909,13.7509898 21.294,13.0699286 21.294,13.0699286 C21.312,13.0492653 21.3439091,13.0467857 21.3651818,13.0641429 C21.384,13.0831531 21.3872727,13.1120816 21.3733636,13.1335714 Z" id="Shape" fill="#B26B56"></path>
+                <path d="M12.1598182,0.716602041 C12.1598182,0.716602041 14.8966364,1.17863265 14.2126364,3.71194898 C14.2126364,3.71194898 12.6155455,3.94172449 12.1598182,0.716602041 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M12.6605455,14.7436531 C12.6605455,14.7436531 15.3973636,15.2048571 14.7133636,17.7381735 C14.7125455,17.7381735 13.1162727,17.9671224 12.6605455,14.7436531 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M17.8715455,10.0853265 C17.8715455,10.0853265 17.9402727,12.8872653 15.3482727,12.6864184 C15.3482727,12.6872449 14.823,11.1457653 17.8715455,10.0853265 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M10.0161818,4.88231633 C10.0161818,4.88231633 13.9279091,3.78964286 14.5660909,7.57763265 C14.5660909,7.57763265 12.5893636,8.87611224 10.0161818,4.88231633 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M0.522818182,25.6150102 C0.522818182,25.6150102 4.527,26.2828469 3.53290909,29.9906633 C3.53209091,29.9906633 1.19863636,30.3311939 0.522818182,25.6150102 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M8.54672727,34.1795204 C8.54672727,34.1795204 5.59227273,36.990551 3.27681818,33.9431327 C3.27681818,33.9423061 4.42309091,31.861102 8.54672727,34.1795204 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M20.6533636,28.3433878 C20.6533636,28.3433878 18.7887273,32.7727653 15.3474545,33.4356429 C15.3474545,33.4356429 15.021,29.3922551 20.6533636,28.3433878 Z" id="Shape" fill="#D3FF8D"></path>
+                <path d="M24.7794545,9.62742857 C24.7794545,9.62742857 24.1347273,14.446102 21.1041818,13.1823367 C21.1041818,13.1823367 20.88,10.3605612 24.7794545,9.62742857 Z" id="Shape" fill="#D3FF8D"></path>
+            </g>
+            <g id="Group" transform="translate(226.000000, 0.000000)" fill-rule="nonzero">
+                <path d="M5.44478127e-05,96.4371271 C0.0165546295,94.4848627 1.44853468,92.2058397 3.20226828,91.3486903 L20.7891048,82.7251041 C19.7224859,81.1801041 19.1084434,79.082219 19.1225864,76.5084029 C19.172087,68.7111845 24.9035429,59.5986443 31.9208345,56.1605753 C34.273289,55.006265 36.4630988,54.6534604 38.3452981,54.9683799 C38.3111191,54.3349891 38.2651543,53.7098857 38.2675115,53.0457133 C38.3724055,37.4489087 49.8270673,19.2332995 63.8616504,12.3524259 C69.4882124,9.59510408 74.6680909,9.09075926 78.8556012,10.4664604 C78.8827087,10.4415983 78.9192448,10.4048972 78.9192448,10.4048972 L79.5415374,10.7091616 C80.2156877,10.9719891 80.8568376,11.2869087 81.4744158,11.6503685 L85.5181389,13.6251271 C89.2283226,8.77465581 93.7953372,4.71503512 98.7524632,2.28802362 C104.091451,-0.330780975 108.963718,-0.617286722 112.765832,0.998747761 C112.777618,0.990460405 112.805904,0.959678795 112.805904,0.959678795 L119.847945,4.39774776 C119.847945,4.39774776 119.13608,4.97431098 118.202642,5.72490868 C119.658193,8.04892017 120.573953,11.0086903 120.758991,14.553311 C122.650619,12.3985983 124.846322,10.6073455 127.189348,9.45895466 C130.13463,8.01458684 132.831231,7.81213857 134.975076,8.62429949 L134.996291,8.60298914 L135.200186,8.70243742 C135.289758,8.74032247 135.372259,8.7876788 135.458296,8.82793167 L142.037154,12.0410581 C142.037154,12.0410581 140.79964,13.0426443 139.439554,14.1318397 C139.675271,15.1050121 139.810808,16.1717133 139.804915,17.347334 C139.784879,19.9258857 139.141372,22.6394029 138.04411,25.2499202 L152.462912,18.1808052 C153.18067,17.8315524 153.832427,17.7830121 154.360433,17.9665179 C154.374576,17.9534949 154.405219,17.9227133 154.405219,17.9227133 L161.447261,21.3595983 C161.447261,21.3595983 154.699865,26.8268857 155.375194,26.0798397 C156.050523,25.3339776 149.286627,28.3564949 148.27658,28.3564949 C147.912397,28.3564949 147.739145,28.0084259 147.597715,27.6035294 L31.7699757,84.3802075 C31.7593684,84.387311 31.7522969,84.3920466 31.7381539,84.400334 C31.7287252,84.400334 31.7192965,84.4086213 31.7110465,84.412173 L11.7234335,94.2113799 C11.8601493,94.7607133 11.8130059,95.3727937 11.4936096,95.7279662 C10.8182807,96.4726443 7.82939065,101.817989 7.82939065,101.817989 L1.39078405,98.6747133 C1.19160328,98.6226213 1.01481562,98.5267248 0.849813804,98.408334 L0.78734883,98.3799202 L0.792063168,98.3574259 C0.297057718,97.9809432 -0.00465988981,97.326242 5.44478127e-05,96.4371271 Z" id="Shape" fill="#DEEBFF"></path>
+                <path d="M10.2726468,94.9108416 L27.8606619,86.2872554 C26.7916859,84.7422554 26.178822,82.6443703 26.192965,80.0705542 C26.2424655,72.2745197 31.9727429,63.1619795 38.9900344,59.7239105 C41.3436675,58.5707841 43.5334773,58.2167956 45.4133195,58.5317151 C45.3814977,57.8983243 45.3355329,57.2732209 45.3378901,56.6090485 C45.4427841,41.0122439 56.8986245,22.7966347 70.932029,15.9157611 C79.7042327,11.6158071 87.408639,12.7665657 91.9285102,18.0479795 C95.7447665,12.813922 100.569891,8.42399101 105.819306,5.85254273 C117.615757,0.0667841087 127.170541,5.57195652 127.825834,18.1166462 C129.717462,15.9631174 131.913165,14.1706807 134.256191,13.0222899 C141.273482,9.57948526 146.921259,13.1146347 146.870579,20.9106692 C146.851722,23.4892209 146.205858,26.203922 145.109774,28.8132554 L159.528576,21.7441404 C161.28231,20.8858071 162.693075,21.7666347 162.683646,23.7177151 C162.668325,25.66406 161.238702,27.943083 159.481433,28.804968 L38.8332827,87.9447266 C38.823854,87.9518301 38.815604,87.9577496 38.8026395,87.9648531 C38.7920323,87.9648531 38.7837822,87.9731404 38.7755321,87.9766922 L10.2219677,101.974037 C8.47176986,102.83237 7.05746857,101.945623 7.07161159,99.9992784 C7.08693318,98.047014 8.51655607,95.7691749 10.2726468,94.9108416 Z" id="Shape" fill="#E9F2FF"></path>
+            </g>
+            <g id="Group" transform="translate(16.000000, 77.000000)" fill-rule="nonzero">
+                <path d="M0.628863309,96.6435977 C0.645381295,94.6913333 2.07772662,92.4134943 3.83453237,91.553977 L21.4415252,82.9327586 C20.3725755,81.3865747 19.7590504,79.2910575 19.7720288,76.7148736 C19.8215827,68.9176552 25.559223,59.8051149 32.5852662,56.367046 C34.9378993,55.2127356 37.1324317,54.859931 39.0143022,55.1748506 C38.982446,54.5414598 38.9364317,53.9163563 38.9387914,53.251 C39.0426187,37.6565632 50.5108201,19.4397701 64.5593669,12.5588966 C70.1908201,9.8003908 75.3774676,9.29722989 79.5706763,10.672931 C79.5954532,10.648069 79.6332086,10.6101839 79.6332086,10.6101839 L80.2561727,10.9168161 C80.9334101,11.1772759 81.5740719,11.4945632 82.1911367,11.8568391 L86.2404029,13.8315977 C89.9545899,8.98112644 94.5241727,4.92268966 99.4866475,2.49567816 C104.832576,-0.123126437 109.708921,-0.409632184 113.517496,1.2064023 C113.528115,1.19693103 113.556432,1.16614943 113.556432,1.16614943 L120.606072,4.6054023 C120.606072,4.6054023 119.893439,5.18196552 118.957813,5.93137931 C120.416115,8.2542069 121.331683,11.2151609 121.518101,14.7609655 C123.41177,12.605069 125.611022,10.8126322 127.955396,9.66542529 C130.903856,8.22105747 133.603367,8.0186092 135.749525,8.83077011 L135.770763,8.80945977 L135.976058,8.90772414 C136.063367,8.9467931 136.148317,8.99296552 136.235626,9.03321839 L142.820403,12.2475287 C142.820403,12.2475287 141.580374,13.2502989 140.21882,14.3383103 C140.454791,15.3114828 140.591655,16.377 140.584576,17.5538046 C140.564518,20.1323563 139.920317,22.8458736 138.82305,25.4563908 L153.25741,18.3872759 C153.974763,18.0368391 154.628403,17.9882989 155.155799,18.1729885 C155.169957,18.1599655 155.200633,18.128 155.200633,18.128 L162.250273,21.5672529 C162.250273,21.5672529 155.495597,27.0333563 156.172835,26.2863103 C156.847712,25.5404483 150.077698,28.5629655 149.065381,28.5629655 C148.701986,28.5629655 148.527367,28.2148966 148.386964,27.81 L32.4318849,84.5878621 C32.422446,84.5949655 32.4153669,84.6008851 32.4023885,84.6091724 C32.3917698,84.6091724 32.3835108,84.6162759 32.3752518,84.6198276 L12.3637122,94.4190345 C12.5017554,94.9695517 12.455741,95.5816322 12.1348201,95.9356207 C11.4587626,96.6814828 8.46664748,102.026828 8.46664748,102.026828 L2.02227338,98.8835517 C1.82169784,98.8302759 1.64471942,98.7343793 1.47953957,98.6171724 L1.41818705,98.5887586 L1.42290647,98.5662644 C0.927366906,98.1874138 0.624143885,97.5327126 0.628863309,96.6435977 Z" id="Shape" fill="#DEEBFF"></path>
+                <path d="M10.7119137,94.9103563 L28.3200863,86.2867701 C27.2511367,84.7417701 26.6376115,82.645069 26.6517698,80.0712529 C26.7001439,72.2728506 32.4377842,63.1614943 39.4614676,59.7222414 C41.8176403,58.5691149 44.0098129,58.2163103 45.8928633,58.5312299 C45.8598273,57.8966552 45.8138129,57.2727356 45.8161727,56.6085632 C45.9211799,41.0117586 57.3882014,22.7961494 71.4379281,15.9152759 C80.220777,11.6153218 87.9323165,12.7660805 92.4558849,18.0474943 C96.2786187,12.8122529 101.10895,8.42232184 106.364029,5.85205747 C118.172029,0.0651149425 127.738302,5.57265517 128.393122,18.1161609 C130.286791,15.9626322 132.484863,14.1701954 134.831597,13.0229885 C141.855281,9.579 147.507971,13.1141494 147.458417,20.9113678 C147.43954,23.4911034 146.792978,26.2034368 145.694532,28.813954 L160.131252,21.7448391 C161.886878,20.8865057 163.299165,21.7661494 163.287367,23.7184138 C163.275568,25.6647586 161.843223,27.9437816 160.082878,28.8056667 L39.3045468,87.9466092 C39.2951079,87.9525287 39.2880288,87.9572644 39.2738705,87.9655517 C39.2632518,87.9655517 39.2561727,87.9738391 39.2467338,87.9785747 L10.6635396,101.973552 C8.91027338,102.833069 7.49680576,101.945138 7.50860432,99.999977 C7.5251223,98.0453448 8.95628777,95.7686897 10.7119137,94.9103563 Z" id="Shape" fill="#E9F2FF"></path>
+            </g>
+            <g id="Group" transform="translate(286.000000, 99.000000)" fill-rule="nonzero">
+                <path d="M40.8528671,60.2199265 L40.0563357,58.6380441 C44.6898462,55.1919706 43.366993,51.2205882 39.3220699,44.6965147 L37.5633566,41.1992206 C41.6834685,38.2093676 40.5474126,34.76925 37.0264615,29.0921029 L22.636028,0.480044118 L6.69717483,32.8014265 C5.6645035,33.9211324 5.08648951,35.1051618 4.97723077,36.2963382 L4.93963636,36.3666176 L4.96665734,36.3666176 C4.81627972,38.2069853 5.77141259,40.0330588 7.83793007,41.5815882 L4.18304895,48.9954706 C2.98472727,50.2902794 2.31625175,51.6672794 2.1834965,53.0430882 L2.14355245,53.1276618 L2.1693986,53.1276618 C2.00257343,55.22175 3.06579021,57.3039265 5.3801958,59.0787794 L2.50422378,64.9107794 C1.20016783,66.3258971 0.468251748,67.8255882 0.324923077,69.3288529 L0.281454545,69.4181912 L0.308475524,69.4181912 C0.0735104895,72.4044706 2.12123077,75.3728824 6.51507692,77.5944265 C15.1559161,81.9588971 29.5674965,81.8016618 38.6911888,77.2156324 C47.1017622,72.9988676 45.9739301,68.4866912 40.8528671,60.2199265 Z" id="Shape" fill="#B4D38C"></path>
+                <path d="M40.8528671,60.2199265 L40.0563357,58.6380441 C44.6898462,55.1919706 43.366993,51.2205882 39.3220699,44.6965147 L37.5633566,41.1992206 C41.6834685,38.2093676 40.5474126,34.76925 37.0264615,29.0921029 L22.636028,0.480044118 L22.5502657,1.28766176 L26.164028,29.0921029 C29.6873287,34.76925 30.8010629,40.5488382 26.680951,43.5386912 L28.4596364,44.6965147 C32.5057343,51.2217794 34.6251189,56.7750441 29.9916084,60.2199265 C35.1126713,68.4866912 38.326993,75.5634706 29.9152448,79.7790441 C26.6492308,81.4216765 32.5633007,80.2983971 38.6923636,77.2156324 C47.1017622,72.9988676 45.9739301,68.4866912 40.8528671,60.2199265 Z" id="Shape" fill="#8AA563"></path>
+            </g>
+            <g id="Group" transform="translate(51.000000, 308.000000)" fill-rule="nonzero">
+                <ellipse id="Oval" fill="#050E26" cx="8.69817143" cy="39.644" rx="8.04990476" ry="3.87084211"></ellipse>
+                <g transform="translate(0.809524, 0.000000)" id="Shape">
+                    <path d="M15.0777587,37.5991579 C15.8091365,35.4558947 14.7013841,32.4256842 14.2134032,30.0890526 C13.074781,24.6098947 8.36475556,1.90010526 7.62506667,0.597473684 L7.54907937,0.597473684 C6.80939048,1.91515789 2.35226032,23.1324211 1.10440635,29.8273684 C0.656793651,32.2311579 -0.294234921,35.5751579 0.286355556,37.2645263 C1.13765079,39.754 4.69480635,42.0732632 7.60013333,42.0732632 C11.5942159,42.0732632 14.4009968,39.5861053 15.0777587,37.5991579 Z" fill="#7A9B54"></path>
+                    <path d="M14.767873,30.3171579 C13.6304381,24.8368421 8.36475556,1.90010526 7.62506667,0.597473684 L10.067346,13.178 C11.4481778,19.5672632 10.5683873,25.9449474 11.1252317,28.6173684 C11.6096508,30.9574737 13.1068381,33.3230526 12.3778349,35.4651579 C11.701073,37.4544211 8.89191746,39.9415789 4.89664762,39.9415789 C3.92662222,39.9415789 2.88417143,39.6822105 1.8939619,39.2445263 C3.3840254,40.9697895 5.95453333,42.3002105 8.15222857,42.3002105 C12.1474984,42.3002105 14.9542794,39.8130526 15.6334159,37.8261053 C16.3636063,35.684 15.2534794,32.6514737 14.767873,30.3171579 Z" fill="#466025"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(72.000000, 332.000000)" fill-rule="nonzero">
+                <ellipse id="Oval" fill="#050E26" cx="8.64236825" cy="39.6984211" rx="8.04990476" ry="3.87084211"></ellipse>
+                <g transform="translate(0.809524, 0.000000)" id="Shape">
+                    <path d="M15.0207683,37.6535789 C15.7533333,35.5091579 14.645581,32.4812632 14.1564127,30.1434737 C13.0189778,24.6631579 8.30895238,1.95452632 7.56926349,0.651894737 L7.49327619,0.651894737 C6.7535873,1.96957895 2.29645714,23.1868421 1.04741587,29.8817895 C0.600990476,32.2855789 -0.350038095,35.6295789 0.230552381,37.3189474 C1.08184762,39.8072632 4.63900317,42.1276842 7.54195556,42.1276842 C11.5372254,42.1276842 14.3440063,39.6393684 15.0207683,37.6535789 Z" fill="#8BAD60"></path>
+                    <path d="M14.7108825,30.3704211 C13.5734476,24.8901053 8.30895238,1.95452632 7.56926349,0.651894737 L10.0127302,13.2324211 C11.3911873,19.6216842 10.5125841,25.9993684 11.0694286,28.6729474 C11.5550349,31.0130526 13.0522222,33.3786316 12.3196571,35.5207368 C11.6428952,37.5088421 8.83492698,39.9948421 4.83965714,39.9948421 C3.86963175,39.9948421 2.82836825,39.7354737 1.83815873,39.2989474 C3.32822222,41.0242105 5.89873016,42.3546316 8.0964254,42.3546316 C12.0928825,42.3546316 14.8996635,39.8674737 15.5776127,37.8805263 C16.3078032,35.7384211 15.1964889,32.7070526 14.7108825,30.3704211 Z" fill="#56722E"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(34.000000, 340.000000)" fill-rule="nonzero">
+                <ellipse id="Oval" fill="#050E26" opacity="0.4" cx="7.98285714" cy="49.8423612" rx="7.74857143" ry="3.98595853"></ellipse>
+                <g id="Shape">
+                    <path d="M14.4742857,46.5310595 C15.1794286,44.3247171 14.1108571,41.2065151 13.6422857,38.801113 C12.5462857,33.1606957 8.01371429,1.74504883 7.30057143,0.405270903 L7.22857143,0.405270903 C6.51657143,1.76173645 2.224,31.6409298 1.024,38.5317271 C0.594285714,41.0062635 -0.321142857,44.4498742 0.237714286,46.1877712 C1.056,48.7493217 4.48114286,51.1392281 7.27542857,51.1392281 C11.12,51.1392281 13.8228571,48.5776776 14.4742857,46.5310595 Z" fill="#B0D384"></path>
+                    <path d="M14.176,39.0347398 C13.08,33.3931304 8.01371429,1.74743278 7.30057143,0.405270903 L9.65257143,21.3923438 C10.2731429,24.4700187 7.72342857,30.3893579 9.128,37.598412 C9.59542857,40.00739 8.512,40.9013699 7.80685714,43.1077124 C7.15542857,45.1543304 9.01257143,47.2402836 5.16571429,47.2402836 C4.23314286,47.2402836 2.736,48.6766114 1.784,48.2272375 C3.21714286,50.0044696 5.69257143,51.3728548 7.80685714,51.3728548 C11.6537143,51.3728548 14.3565714,48.8124963 15.0102857,46.7658783 C15.712,44.5619197 14.6434286,41.4413338 14.176,39.0347398 Z" fill="#7A9B54"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(132.000000, 179.000000)" fill-rule="nonzero">
+                <path d="M25.792,62.5469824 C25.792,65.9563983 20.0192375,68.7149364 12.8972199,68.7149364 C5.78008211,68.7149364 0.00731964809,65.9563983 0.00731964809,62.5469824 C0.00731964809,59.1458505 5.78008211,56.3873123 12.8972199,56.3873123 C20.0180176,56.3861289 25.792,59.1458505 25.792,62.5469824 Z" id="Shape" fill="#050E26"></path>
+                <g id="Shape">
+                    <path d="M24.4146862,59.2890436 C25.5882698,55.8748941 23.8083754,51.0489316 23.0276129,47.3270944 C21.2062405,38.5946822 13.6633431,2.41771489 12.4775601,0.343190073 L12.3567859,0.343190073 C11.1722229,2.44138317 4.03068622,36.2420551 2.03364223,46.9105327 C1.31631672,50.7388771 -0.204950147,56.0642403 0.72342522,58.7565073 C2.08609971,62.7233111 7.78322581,66.4202966 12.4348622,66.4202966 C18.8334545,66.4179298 23.3277185,62.4534927 24.4146862,59.2890436 Z" fill="#6A8C3E"></path>
+                    <path d="M23.9157302,47.6868523 C22.0931378,38.9556235 14.5490205,2.77983959 13.3656774,0.702947942 L16.389912,20.3831235 C18.6004457,30.5628511 17.1926334,40.7236441 18.0844106,44.9827512 C18.8615132,48.7081386 21.2586979,52.4784958 20.0887742,55.8914619 C19.0018065,59.0594613 14.5075425,63.0227149 8.10651026,63.0227149 C6.55596481,63.0227149 4.88342522,62.60852 3.29872141,61.9126725 C5.68492669,64.6617433 9.80344868,66.7800545 13.3241994,66.7800545 C19.7227918,66.7800545 24.2207155,62.8168008 25.3052434,59.6511683 C26.4702874,56.2370188 24.6940528,51.4086895 23.9157302,47.6868523 Z" fill="#466025"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(97.000000, 201.000000)" fill-rule="nonzero">
+                <path d="M25.4220909,62.6653238 C25.4220909,66.0747397 19.8297273,68.8332778 12.9302727,68.8332778 C6.03554545,68.8332778 0.443181818,66.0747397 0.443181818,62.6653238 C0.443181818,59.2630085 6.03554545,56.5056538 12.9302727,56.5056538 C19.8285455,56.5056538 25.4220909,59.2630085 25.4220909,62.6653238 Z" id="Shape" fill="#050E26"></path>
+                <g transform="translate(0.812500, 0.000000)" id="Shape">
+                    <path d="M23.2753182,59.407385 C24.4110455,55.9920521 22.6867727,51.167273 21.9315909,47.4442524 C20.1659545,38.7118402 12.8587727,2.53487288 11.7124091,0.460348063 L11.5930455,0.460348063 C10.4455,2.55972458 3.52831818,36.3603965 1.59368182,47.0276907 C0.898772727,50.8572185 -0.576136364,56.1825817 0.324409091,58.8760321 C1.64331818,62.8404691 7.16359091,66.538638 11.6698636,66.538638 C17.8685,66.5374546 22.2211364,62.5718341 23.2753182,59.407385 Z" fill="#7A9B54"></path>
+                    <path d="M22.7931364,47.8051937 C21.0275,39.0739649 13.7179545,2.89936441 12.5727727,0.82247276 L15.5025,20.5026483 C17.6439545,30.6823759 16.2789545,40.8431689 17.1440455,45.102276 C17.8956818,48.82648 20.2191364,52.5980206 19.0857727,56.0109867 C18.0327727,59.1789861 13.6777727,63.1422397 7.47795455,63.1422397 C5.97468182,63.1422397 4.35440909,62.7268614 2.82040909,62.0310139 C5.13086364,64.7800847 9.12186364,66.8983959 12.5314091,66.8983959 C18.7312273,66.8983959 23.0874091,62.9351423 24.1392273,59.7706931 C25.2666818,56.3553602 23.5447727,51.5293977 22.7931364,47.8051937 Z" fill="#466025"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(68.000000, 232.000000)" fill-rule="nonzero">
+                <path d="M25.5000909,61.6924138 C25.5000909,65.0713103 19.9100909,67.8030345 13.0094545,67.8030345 C6.11472727,67.8030345 0.521181818,65.0713103 0.521181818,61.6924138 C0.521181818,58.3217241 6.11472727,55.59 13.0094545,55.59 C19.9100909,55.59 25.5000909,58.3217241 25.5000909,61.6924138 Z" id="Shape" fill="#050E26"></path>
+                <g transform="translate(0.812500, 0.000000)" id="Shape">
+                    <path d="M23.3533182,58.4647586 C24.4914091,55.0823448 22.7671364,50.3012414 22.0107727,46.6128276 C20.2463182,37.9627586 12.9379545,2.12206897 11.7915909,0.0656551724 L11.6722273,0.0656551724 C10.5258636,2.14551724 3.6075,35.6308276 1.67168182,46.2001379 C0.979136364,49.994069 -0.495772727,55.2711034 0.403590909,57.9383448 C1.7225,61.8671034 7.24277273,65.5297241 11.7478636,65.5297241 C17.9476818,65.5285517 22.3003182,61.6009655 23.3533182,58.4647586 Z" fill="#B0D384"></path>
+                    <path d="M22.8711364,46.9704138 C21.1066818,38.3203448 13.7971364,2.48082759 12.6507727,0.423241379 L15.5805,19.9216552 C17.7219545,30.0067586 16.3569545,40.0731034 17.2208636,44.2926207 C17.9736818,47.9822069 20.2959545,51.7186897 19.1625909,55.099931 C18.1107727,58.2384828 13.7557727,62.1637241 7.55477273,62.1637241 C6.05268182,62.1637241 4.43359091,61.7533793 2.89722727,61.064 C5.20886364,63.7863448 9.19868182,65.8861379 12.6094091,65.8861379 C18.8080455,65.8861379 23.1665909,61.9597241 24.2160455,58.8235172 C25.3470455,55.4422759 23.6263182,50.6588276 22.8711364,46.9704138 Z" fill="#8BAA61"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(265.000000, 338.000000)" fill-rule="nonzero">
+                <g opacity="0.3" transform="translate(12.658915, 22.852941)" fill="#616D3C" id="Shape">
+                    <path d="M0.261901938,23.0750882 C5.9123186,27.1107426 18.8272186,32.361 26.0917019,32.361 C32.1444519,31.9561324 45.0581686,30.7462647 51.1121019,28.7278456 C65.2387353,24.6898235 53.5355686,1.67747794 41.0241853,0.0615588235"></path>
+                </g>
+                <g id="Shape">
+                    <path d="M38.7174833,0.167330882 C37.19335,3.21922794 29.4034667,12.0860662 29.4034667,12.0860662 C29.4034667,12.0860662 8.04903333,27.3443676 3.47308333,28.8715 C-1.10286667,30.3986324 0.42245,39.5519559 3.47308333,42.6062206 C6.52371667,45.6581176 28.04145,52.0507647 28.04145,52.0507647 L57.0212833,42.8950735 C55.49715,38.3172279 55.49715,23.0577426 55.49715,23.0577426 C47.8693833,16.9539485 38.7174833,0.167330882 38.7174833,0.167330882 Z" fill="#89756D"></path>
+                    <path d="M3.47308333,42.6062206 L37.19335,20.0046618 C37.19335,12.3749191 38.7174833,0.167330882 38.7174833,0.167330882 L21.939,16.9539485 C21.939,16.9539485 1.57975,27.2354559 0.583383333,32.2134338 C-0.939566667,39.8419926 3.47308333,42.6062206 3.47308333,42.6062206 Z" fill="#C19B7C"></path>
+                    <path d="M37.19335,20.0046618 C37.19335,12.3749191 38.7174833,0.167330882 38.7174833,0.167330882 L21.939,16.9539485 L37.19335,20.0046618 Z" fill="#F9E8DE"></path>
+                    <path d="M34.71545,25.3389706 C34.71545,25.3389706 34.1415333,35.2653309 32.6162167,36.7900956 C31.0920833,38.3160441 28.04145,50.5248162 28.04145,52.0507647 C28.04145,53.5767132 23.4158,39.8739559 23.4158,39.8739559 L34.71545,25.3389706 Z" fill="#C19B7C"></path>
+                </g>
+            </g>
+            <g id="Group" opacity="0.2" transform="translate(178.000000, 231.000000)" fill="#285128" fill-rule="nonzero">
+                <path d="M0.127459459,60.8479437 C6.62317117,82.5530704 25.388036,76.283831 39.8228198,74.1128451 C61.4755856,71.2189859 80.480027,84.7240563 102.852703,83.2771268 C129.55664,81.1061408 133.647144,65.1887324 129.315883,44.207662 C125.708072,28.2914366 137.496892,14.7851831 117.04673,3.69126761 C97.4935045,-6.91757746 76.1499459,13.8209577 59.5495315,22.5013521 C45.837018,29.736 0.126279279,44.207662 0.126279279,63.0189296" id="Shape"></path>
+            </g>
+            <g id="Group" transform="translate(161.000000, 166.000000)">
+                <g transform="translate(15.692798, 94.237288)" id="Shape" stroke="#703D33" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.714">
+                    <path d="M23.6830533,43.6306864 L23.6830533,11.7407881"></path>
+                    <path d="M0.0353900975,0.216745763 L0.0353900975,32.1054661"></path>
+                </g>
+                <g transform="translate(119.146662, 42.406780)" id="Shape" stroke="#703D33" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.714">
+                    <path d="M23.8513953,43.8792373 L23.8513953,11.989339"></path>
+                    <path d="M0.204911853,0.464118644 L0.204911853,32.352839"></path>
+                </g>
+                <path d="M17.198057,55.5764407 C17.198057,55.5764407 20.8503151,86.5239661 21.8129257,87.4804746" id="Shape" stroke="#703D33" stroke-width="1.714" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M103.166502,13.0353729 C103.166502,13.0353729 106.81876,43.9840763 107.780191,44.9405847" id="Shape" stroke="#703D33" stroke-width="1.714" stroke-linecap="round" stroke-linejoin="round"></path>
+                <g transform="translate(7.435109, 35.338983)" fill-rule="nonzero" id="Shape">
+                    <g>
+                        <polygon fill="#77462B" points="9.51167854 64.6938983 123.204726 7.19501695 123.204726 4.97101695 114.206204 2.61508475 0.513156414 57.892322 0.513156414 60.1139661"></polygon>
+                        <polygon fill="#EAA16E" points="9.51167854 62.4710763 123.204726 4.97101695 114.206204 0.391084746 0.513156414 57.892322"></polygon>
+                    </g>
+                    <g transform="translate(10.617029, 5.534350)">
+                        <polygon fill="#77462B" points="9.16131658 64.3696928 122.855544 6.86845547 122.855544 4.64563344 113.857022 2.28852327 0.162794449 57.5657606 0.162794449 59.7885826"></polygon>
+                        <polygon fill="#EAA16E" points="9.16131658 62.1456928 122.855544 4.64563344 113.857022 0.0657012336 0.162794449 57.5657606"></polygon>
+                    </g>
+                    <g transform="translate(20.876969, 10.601695)">
+                        <polygon fill="#77462B" points="9.24708177 64.4535932 122.941309 6.95235593 122.941309 4.73071186 113.942787 2.37360169 0.24973931 57.649661 0.24973931 59.8724831"></polygon>
+                        <polygon fill="#EAA16E" points="9.24708177 62.2295932 122.941309 4.73071186 113.942787 0.149601695 0.24973931 57.649661"></polygon>
+                    </g>
+                </g>
+                <g fill-rule="nonzero" id="Shape">
+                    <g transform="translate(2.359340, 11.779661)">
+                        <polygon fill="#77462B" points="2.11833646 66.9438136 3.75217929 67.5492881 115.805486 9.58275424 115.614379 0.731516949 114.012387 0.159025424 0.324058515 57.5189068"></polygon>
+                        <polygon fill="#E08344" points="3.72150788 67.5163051 117.409837 10.1564237 115.614379 0.731516949 1.92722993 58.0913983"></polygon>
+                    </g>
+                    <g>
+                        <polygon fill="#77462B" points="2.04283758 67.1322881 3.67668042 67.7377627 115.731167 9.77122881 113.935709 0.3475 0.24737997 57.7073814"></polygon>
+                        <polygon fill="#E08344" points="3.64364966 67.7059576 117.331979 10.3448983 115.537701 0.919991525 1.84937172 58.2810508"></polygon>
+                    </g>
+                </g>
+            </g>
+            <g id="Group" transform="translate(97.000000, 305.000000)">
+                <g transform="translate(0.000000, 8.428357)" fill-rule="nonzero" id="Shape">
+                    <path d="M8.06360326,8.02117029 L0.16557337,0.0508327082 C0.16557337,0.0508327082 1.64725543,3.21516879 3.09046739,7.45623406 C4.53251359,11.6996099 7.64742663,17.4621905 8.76305978,20.167877 C9.87869293,22.8747187 10.9395353,25.3262416 10.9395353,25.3262416 C10.9395353,25.3262416 11.6436549,18.4973293 10.989663,15.4277269 C10.3345054,12.3569692 10.3345054,12.3569692 10.3345054,12.3569692" fill="#B0E082"></path>
+                    <path d="M0.16557337,0.0508327082 C0.16557337,0.0508327082 9.43686957,5.59737434 10.7833234,10.65985 C12.1321087,15.7269467 11.194837,15.8494074 10.775163,25.9396999 C10.775163,25.9396999 11.0666033,16.2133233 5.04195109,6.06988747 C4.07670109,4.44555139 0.16557337,0.0508327082 0.16557337,0.0508327082 Z" fill="#85B557"></path>
+                </g>
+                <path d="M25.7831685,9.60213053 C21.1993967,10.2779745 17.3896902,14.6230158 15.2656739,18.2090323 C17.0912554,11.0693473 19.5813207,2.94073518 18.0658315,0.0421155289 C7.18811685,4.2623856 10.9162201,25.24012 10.3519918,34.6950038 L10.8754185,34.6233758 C11.7264239,26.8066917 27.3779293,15.7205401 25.7831685,9.60213053 Z" id="Shape" fill="#85B557" fill-rule="nonzero"></path>
+                <g transform="translate(9.679348, 0.000000)">
+                    <g id="SVGID_51_-link" fill="#85B557" fill-rule="nonzero">
+                        <path d="M16.1038207,9.60213053 C11.5200489,10.2779745 8.52171196,12.444141 6.39769565,16.0301575 C8.22444293,8.88931733 9.90197283,2.94073518 8.3864837,0.0421155289 C-3.90646467,5.86130533 1.23687228,25.24012 0.672644022,34.6950038 L0.9384375,34.7227307 C1.78827717,26.9072018 17.6985815,15.7205401 16.1038207,9.60213053 Z" id="SVGID_51_"></path>
+                    </g>
+                    <g id="Clipped">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <g id="SVGID_51_"></g>
+                        <path d="M9.77257337,-2.12289572 C9.77257337,-2.12289572 5.72854891,3.14637659 4.49633967,7.39783946 C3.26413043,11.6504576 1.53297554,21.5582146 1.41173641,24.3135784 C1.29049728,27.0689422 0.673809783,34.6950038 0.673809783,34.6950038 L-0.854502717,34.1162041 C-0.854502717,34.1162041 -0.476796196,8.30474119 1.48984239,5.45579895 C3.45648098,2.60685671 9.77257337,-2.12289572 9.77257337,-2.12289572 Z" id="Shape" fill="#B0E082" fill-rule="nonzero" mask="url(#mask-2)"></path>
+                    </g>
+                    <g id="Clipped">
+                        <mask id="mask-4" fill="white">
+                            <use xlink:href="#path-3"></use>
+                        </mask>
+                        <g id="SVGID_51_"></g>
+                        <path d="M16.7275027,8.86967742 C16.7275027,8.86967742 12.2078478,13.4203601 10.3682772,16.1329782 C8.526375,18.8455964 4.3704375,25.3417854 3.42500543,27.4836909 C2.47957337,29.6255964 0.673809783,34.6950038 0.673809783,34.6950038 L-0.285611413,34.8729182 C-0.285611413,34.8729182 2.20911685,24.4036909 3.65582609,21.7107127 C5.1002038,19.0188897 5.17248098,17.835874 7.02021196,15.2549587 C8.86677717,12.6740435 10.0068913,11.6989797 10.0068913,11.6989797 C10.0068913,11.6989797 12.6520027,9.20702176 13.7058505,9.15387847" id="Shape" fill="#B0E082" fill-rule="nonzero" mask="url(#mask-4)"></path>
+                    </g>
+                </g>
+            </g>
+            <g id="Group" transform="translate(362.000000, 204.000000)">
+                <g transform="translate(33.476721, 0.000000)">
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(24.227076, 17.756414) rotate(-179.329603) translate(-24.227076, -17.756414) " cx="24.2270761" cy="17.7564137" rx="2.03962441" ry="1.77604566"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(15.810171, 7.832777) rotate(-179.358250) translate(-15.810171, -7.832777) " cx="15.8101711" cy="7.83277731" rx="2.03841718" ry="1.77484909"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(6.198341, 1.847034) rotate(-179.341062) translate(-6.198341, -1.847034) " cx="6.19834132" cy="1.84703447" rx="2.03961968" ry="1.77366874"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(24.380487, 47.149680) rotate(-179.346791) translate(-24.380487, -47.149680) " cx="24.3804868" cy="47.1496803" rx="2.03961734" ry="1.7748531"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(26.488087, 25.058694) rotate(-179.329603) translate(-26.488087, -25.058694) " cx="26.4880871" cy="25.0586941" rx="2.03962441" ry="1.77604566"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(16.920576, 32.139989) rotate(-179.329603) translate(-16.920576, -32.139989) " cx="16.9205763" cy="32.1399891" rx="2.03962441" ry="1.77367285"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" transform="translate(26.236463, 37.378770) rotate(-179.312415) translate(-26.236463, -37.378770) " cx="26.236463" cy="37.3787697" rx="2.03963166" ry="1.77486556"></ellipse>
+                    <path d="M22.197457,24.6898305 C22.197457,24.6898305 4.66163335,24.1357627 0.728118674,46.8110169" id="Shape" stroke="#F7F7F7" stroke-width="0.639"></path>
+                    <path d="M20.6216599,18.8762712 C20.6216599,18.8762712 12.9746204,21.6276271 11.2685033,28.2372881" id="Shape" stroke="#FFFFFF" stroke-width="0.639"></path>
+                    <path d="M13.1168965,32.9901695 C13.1168965,32.9901695 7.38998608,34.3462712 6.31633983,33.150339" id="Shape" stroke="#F7F7F7" stroke-width="0.639"></path>
+                    <path d="M12.5609438,10.3801695 C12.5609438,10.3801695 0.600189777,21.6038983 0.0298899291,35.7972881" id="Shape" stroke="#F7F7F7" stroke-width="0.639"></path>
+                    <path d="M22.4186425,39.9557627 C22.4186425,39.9557627 12.5549658,46.2332203 6.81490385,48.6535593" id="Shape" stroke="#F7F7F7" stroke-width="0.639"></path>
+                    <path d="M4.46316422,4.9640678 C4.46316422,4.9640678 0.694641953,13.4411864 5.1028087,20.2371186" id="Shape" stroke="#F7F7F7" stroke-width="0.639"></path>
+                    <path d="M20.8428454,46.089661 L14.4691169,44.5971186" id="Shape" stroke="#E8E4E7" stroke-width="0.639"></path>
+                </g>
+                <g transform="translate(0.000000, 15.423729)">
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" cx="4.82662576" cy="2.26966102" rx="1.78861336" ry="1.77491525"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" cx="2.3218497" cy="9.72288136" rx="1.78861336" ry="1.77491525"></ellipse>
+                    <ellipse id="Oval" fill="#FF7A71" fill-rule="nonzero" cx="11.2649165" cy="17.8879661" rx="1.78861336" ry="1.77491525"></ellipse>
+                    <path d="M6.61404352,9.01457627 C6.61404352,9.01457627 21.9954011,8.65864407 25.2151442,31.3777966" id="Shape" stroke="#F4F4F4" stroke-width="0.5984" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <path d="M13.5891574,16.2898305 C13.5891574,16.2898305 16.9882401,14.3369492 19.8493041,16.8213559" id="Shape" stroke="#F4F4F4" stroke-width="0.5984" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <path d="M8.04517333,3.51186441 C8.04517333,3.51186441 14.3029289,6.88372881 15.3777707,11.8537288" id="Shape" stroke="#F4F4F4" stroke-width="0.5984" stroke-linecap="round" stroke-linejoin="round"></path>
+                </g>
+            </g>
+            <g id="Group" transform="translate(222.000000, 148.000000)">
+                <g id="Shape">
+                    <path d="M43.2711781,33.4327532 C43.2711781,33.4327532 48.3088356,49.3287967 49.3683288,51.9356155 C50.4290137,54.5412532 54.3070685,64.5090575 54.3070685,64.5090575 L49.3361507,65.7799851 C49.3361507,65.7799851 44.5964384,59.7525285 42.7432192,56.6271807 C41.4286849,54.4148691 36.5113973,42.2938112 36.5113973,42.2938112" fill="#FFC0B6" fill-rule="nonzero"></path>
+                    <path d="M44.1995753,37.3081372 L39.8245479,47.6350141 C38.9295205,46.2672314 36.4434658,42.1627025 36.4434658,42.1627025" fill="#DD705E" fill-rule="nonzero"></path>
+                    <g transform="translate(36.945205, 133.471014)" fill-rule="nonzero">
+                        <path d="M0.698383562,4.0195213 C2.60880822,8.12759376 1.55884932,10.8064633 5.11035616,13.9719706 C8.85731507,17.3063836 9.29469863,20.6915865 12.6936575,21.3553981 C14.7232603,15.6704778 8.72979452,9.17410101 6.62749315,0.0201155029" fill="#FFC0B6"></path>
+                        <g transform="translate(2.383562, 7.444884)">
+                            <path d="M13.2597534,12.4151667 C15.9496027,16.5775725 13.8175068,19.1501377 11.3636301,19.4572391 C8.25784932,19.8446594 4.3809863,17.8307826 3.72193151,15.9291159 C3.04380822,13.9731159 2.93416438,13.7794058 2.48247945,12.8533768 C2.01172603,11.8836449 0.815178082,10.7013043 0.50769863,9.35360145 C0.106068493,7.59485507 0.104876712,6.90387681 0.104876712,6.90387681 L0.0989178082,2.60681884 C0.0989178082,2.60681884 0.777041096,3.56828261 1.68279452,2.83005797 C2.98421918,1.77055797 4.57047945,-0.581130435 6.70257534,0.309463768 C10.0383699,1.70323188 9.75710959,6.99364493 13.2597534,12.4151667 Z" fill="#000000"></path>
+                            <path d="M0.23239726,7.83935507 C0.287219178,8.12755797 0.355150685,8.45710145 0.442150685,8.84334058 C0.750821918,10.1910435 1.4229863,11.2871594 2.08680822,12.2013768 C2.69342466,13.0364565 2.97826027,13.4652174 3.65519178,15.4223986 C4.31424658,17.3217029 8.19230137,19.3367609 11.2968904,18.9481594 C12.990411,18.737913 14.365726,17.6028188 14.5111233,15.507442 C15.4562055,18.5241232 13.561274,20.2167246 11.494726,20.4765797 C6.35576712,21.115587 4.42389041,18.5949928 3.8530274,16.9472754 C3.17371233,14.9924565 3.0140137,14.8235507 2.71487671,13.8455507 C2.41573973,12.8651884 0.902178082,11.4808696 0.593506849,10.1319855 C0.191876712,8.37323913 0.235972603,7.92203623 0.235972603,7.92203623 L0.23239726,7.83935507 Z" fill="#FFFFFF"></path>
+                            <path d="M13.860411,17.8662174 C13.860411,17.8662174 12.9463151,16.1724348 10.7844247,16.1901522 C8.71430137,16.2078696 7.20312329,18.6989348 7.20312329,18.6989348 C7.20312329,18.6989348 9.70467123,19.9710435 10.9095616,19.8210362" fill="#FFFFFF"></path>
+                        </g>
+                    </g>
+                    <g transform="translate(63.164384, 118.473869)" fill-rule="nonzero">
+                        <path d="M1.2740137,4.47423188 C3.18563014,8.58112319 0.611383562,10.4012899 4.16408219,13.5644348 C7.9110411,16.9012101 12.5077397,19.4607826 15.910274,20.123413 C17.9410685,14.4384928 7.34375342,9.36186957 7.84191781,0.663811594" fill="#FFC0B6"></path>
+                        <path d="M1.80793151,8.84215942 C1.80793151,8.84215942 -1.12146575,14.0534348 3.30480822,15.9173043 C9.78094521,18.6469638 12.033411,21.8042029 15.621863,22.5034493 C21.0075205,23.5535 23.4006164,21.0848768 22.7594384,19.5505507 C21.4866164,16.5067029 14.5242329,13.4002536 11.7581096,8.1559058 C8.95861644,2.84895652 7.99446575,8.98744203 7.00171233,9.91465217 C3.88639726,12.825029 1.80793151,8.84215942 1.80793151,8.84215942 Z" fill="#000000"></path>
+                        <path d="M0.937931507,13.1699275 C1.21442466,14.1113116 1.63989041,15.0715942 5.57991781,16.5905652 C10.0622055,18.3162391 12.0572466,21.6978986 15.621863,22.5046304 C20.5272329,23.612558 22.0848904,20.8226594 22.7153425,19.3946377 C22.7522877,19.4383406 22.8309452,19.6202391 22.8643151,19.663942 C23.9071233,20.967942 21.6046027,24.8787609 15.4109178,23.635 C11.8248493,22.9168551 8.98841096,18.8229565 2.92343836,17.4941522 C0.0726986301,16.8693188 0.927205479,14.1680072 0.937931507,13.1699275 Z" fill="#FFFFFF"></path>
+                        <path d="M23.0454658,20.2427101 C23.0454658,20.2427101 21.1255068,18.3871087 20.0612466,19.4241667 C18.9969863,20.4624058 18.3403151,22.7184203 18.3403151,22.7184203 C18.3403151,22.7184203 20.5987397,22.6451884 20.8573562,22.523529" fill="#FFFFFF"></path>
+                    </g>
+                    <path d="M45.2602603,65.6819488 C40.1582466,58.4414416 39.4038493,35.9391735 37.4147671,35.8411372 C33.1672603,35.6332532 23.9798219,35.802159 19.7311233,37.1451372 C15.2464521,38.7916735 4.34761644,46.3947967 2.48486301,51.2458184 C1.67326027,53.5195503 6.99694521,59.1028909 8.12436986,61.4073329 C10.3756438,66.0150358 12.1216027,75.3650938 14.142863,78.1916083" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    <path d="M12.566137,74.7957749 C13.0488082,82.5902459 13.098863,85.0009923 19.1137808,92.5580503 C24.495863,99.3178256 29.6836849,103.370384 30.6776301,110.573094 C32.0672466,120.629485 37.2550685,138.377587 37.7067534,138.703587 C38.7221507,139.437087 46.5581096,137.968905 45.713137,135.80384 C44.6739041,133.14505 44.9694658,114.095311 43.2699863,103.145963 C42.7396438,99.7300503 36.9463973,85.7415793 36.9082603,84.6643619 C36.8546301,83.1772822 39.0832603,83.3072097 39.0832603,83.3072097 C40.2500137,84.0099996 59.3161233,94.7089416 59.1754932,97.0547242 C58.7106986,104.872818 63.2525753,120.801934 64.6421918,123.831608 C65.2690685,125.194666 72.7141233,124.826144 72.0002466,121.487007 C70.383,113.947666 71.3030548,91.7182459 68.5202466,87.8676662 C63.1524658,80.441717 46.7011233,66.3363112 46.7011233,66.3363112 C46.7011233,66.3363112 35.941726,73.1846735 31.1412329,73.9914054 C15.1368082,76.6773619 12.566137,74.7957749 12.566137,74.7957749 Z" fill="#F26D5B" fill-rule="nonzero"></path>
+                    <path d="M24.9296712,74.3800068 C30.6847808,79.7271155 27.6397808,81.8532025 29.1473836,81.8520213 C32.4641096,81.8461155 36.8689315,85.1982459 38.0035068,88.0613764 C38.2073014,88.5787242 36.599589,84.9974488 38.1632055,84.2604054 C39.7256301,83.5221807 43.2521096,86.4703546 45.9550685,87.0845575 C45.9550685,87.0845575 42.4047534,80.3814778 46.9323288,76.9218619 C51.4587123,73.4587025 53.3441096,74.0882604 53.3441096,74.0882604 C47.5306027,70.2754778 47.0717671,66.5831735 47.0717671,66.5831735 L24.9296712,74.3800068 Z" fill="#D85648" fill-rule="nonzero"></path>
+                    <g transform="translate(15.129941, 61.778217)" fill-rule="nonzero">
+                        <path d="M16.1817162,23.3668768 C17.0183464,23.7708333 18.6451272,23.6468116 19.8166477,23.0881232 L45.083593,10.0587536 C46.2539217,9.5036087 46.3004012,9.16343478 45.463771,8.75947826 L30.6999902,1.65362319 C29.8621683,1.24966667 29.3926067,0.85515942 28.2234697,1.41148551 L1.00081213,13.6766449 C-0.171900196,14.2341522 0.030702544,15.559413 0.868524462,15.9645507 L16.1817162,23.3668768 Z" fill="#2D3B54"></path>
+                        <path d="M16.0947162,22.5105362 C16.906319,22.9026812 18.483045,22.7822029 19.6164286,22.2412319 L45.5424286,9.82724638 C46.6758121,9.28745652 46.6317162,8.50671014 45.8201135,8.11574638 L31.2875382,0.965007246 C30.4747436,0.574043478 28.4153464,0.291746377 27.2795793,0.831536232 L1.35596282,13.2443406 C0.222579256,13.7853116 -0.0658317025,14.6841739 0.745771037,15.0763188 L16.0947162,22.5105362 Z" fill="#FFFFFF"></path>
+                        <path d="M17.2042642,21.212442 C17.6630998,21.4333188 18.5509765,21.3648116 19.1921546,21.0600725 L33.8164971,14.0569783 C34.4564834,13.7534203 34.6018806,13.3258406 34.1442368,13.1037826 L25.7743601,9.05831159 C25.3167162,8.83625362 24.4276477,8.90357971 23.7888532,9.2095 L9.16451076,16.2102319 C8.52452446,16.5173333 8.37793542,16.9437319 8.83438748,17.1634275 L17.2042642,21.212442 Z" fill="#2D3B54"></path>
+                    </g>
+                    <path d="M27.3358767,74.7060068 C27.2166986,74.7213619 26.6672877,74.7060068 25.8246986,74.6741155 C23.8785205,74.6020648 20.368726,74.4508764 17.0269726,74.4059923 C14.5444932,74.3752822 7.35924658,72.9850575 5.11393151,72.7228401 C3.99365753,72.5905503 2.77565753,65.282717 2.12375342,60.4683112 C1.52786301,56.0696735 0.659054795,48.40513 2.32158904,46.2979416 C3.306,45.360101 11.3576712,43.2434633 11.8653699,44.7352677 C13.1989726,48.642543 12.5125068,64.7393836 12.615,65.5402097 C12.615,65.5402097 23.8606438,70.2494923 29.2975479,69.572688 C31.0649589,69.3518112 34.8035753,68.3442822 34.8035753,68.3442822 C34.8035753,68.3442822 35.6449726,73.8071445 34.1671644,74.1272387 C32.6893562,74.4473329 28.285726,74.5878909 27.3358767,74.7060068 Z" fill="#FFC0B6" fill-rule="nonzero"></path>
+                    <path d="M1.79363014,57.8969271 C0.996328767,51.9344343 1.55050685,47.6350141 1.79363014,47.2428691 C1.12265753,48.3295358 12.392137,54.0321735 12.4195479,54.117217 L1.79363014,57.8969271 Z" fill="#DD705E" fill-rule="nonzero"></path>
+                    <path d="M13.9438356,54.3451807 C9.57,54.7349633 0.622109589,53.9731155 0.731753425,51.9663256 C0.871191781,49.4150213 1.22038356,41.4433764 2.03317808,39.1696445 C3.89593151,34.3209851 14.7935753,26.7154996 19.2794384,25.0689633 C23.5269452,23.7248039 31.0435068,25.4174054 33.7273973,25.8083691 C41.8207808,26.9871662 43.8682603,32.453572 45.6571233,35.7749923 C45.6571233,35.7749923 41.7814521,41.9323764 38.6983151,42.4213764 C38.008274,42.5312242 39.1678767,49.0524054 39.1952877,50.3363256 C39.2226986,51.6249706 40.3882603,54.9310358 40.3882603,54.9310358" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    <g transform="translate(32.178082, 50.789855)">
+                        <path d="M0.734136986,33.9749054 C0.675739726,34.7485648 1.22276712,35.0745648 1.95690411,34.6954126 L28.487137,21.2620865 C29.2224658,20.8864778 29.8696027,19.9509996 29.9291918,19.1749778 L31.3295342,0.900079271 C31.3879315,0.122876372 30.8397123,-0.200761309 30.1043836,0.177209706 L3.57534247,13.611717 C2.83882192,13.9885068 2.19406849,14.9228039 2.13447945,15.7000068 L0.734136986,33.9749054 Z" fill="#629AF4" fill-rule="nonzero"></path>
+                        <path d="M0.636410959,33.9760865 L2.03794521,15.6988256 C2.09872603,14.9239851 2.74347945,13.9885068 3.47880822,13.6105358 L30.0090411,0.178390865 C30.5155479,-0.0814642073 30.9314795,-0.0105946421 31.1257397,0.31186188 C30.9302877,0.284695213 30.6978904,0.327216952 30.4404658,0.460687967 L3.91023288,13.8916517 C3.17609589,14.2684416 2.5289589,15.205101 2.47056164,15.9823039 L1.0690274,34.2560213 C1.04876712,34.4993401 1.09286301,34.6965938 1.17867123,34.8442387 C0.819945205,34.7899054 0.601849315,34.4792604 0.636410959,33.9760865 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+                        <path d="M15.9996575,18.2241445 C15.9936986,19.0769416 16.7254521,19.4371952 17.6347808,19.0332387 C18.5429178,18.628101 19.2806301,17.6087604 19.2842055,16.7559633 C19.286589,15.9055285 18.5572192,15.5440938 17.6478904,15.9468691 C16.7397534,16.353188 16.0020411,17.3713474 15.9996575,18.2241445 Z" stroke="#FFFFFF" stroke-width="0.2128" stroke-linecap="round" stroke-linejoin="round"></path>
+                    </g>
+                    <g transform="translate(14.301370, 0.000000)" fill-rule="nonzero">
+                        <path d="M16.5204658,6.38065898 C14.5218493,2.50527492 4.71945205,7.75789087 2.6660137,10.3540793 C0.0119178082,14.0014996 3.05453425,22.9865793 7.32468493,25.3524416 C17.1938219,30.9617677 17.7384658,9.40678942 17.9839726,4.56167347" fill="#FFC0B6"></path>
+                        <path d="M12.169274,29.8148619 C12.4850959,33.5331517 3.61109589,35.3367822 1.99146575,31.2617822 C1.08809589,28.9845068 1.7459589,28.51913 2.0260274,23.0031155 C2.06773973,22.1503184 2.22147945,18.2265068 2.61476712,17.6808112 C4.90894521,14.50113 9.94064384,17.1008619 11.6139041,20.6171735 C12.9641918,23.4519561 13.2251918,20.9821517 12.566137,24.9284054 C12.566137,24.9295865 11.9702466,27.4702604 12.169274,29.8148619 Z" fill="#FFC0B6"></path>
+                        <path d="M12.6293014,25.4327604 C12.6293014,25.4327604 10.1503973,27.3793112 7.93726027,25.9678256 C5.98393151,24.7240648 4.76593151,22.6204199 4.76593151,22.6204199 C4.76593151,22.6204199 5.1890137,26.911572 8.14582192,28.1364343 C11.1026301,29.3612967 12.6293014,25.4327604 12.6293014,25.4327604 Z" fill="#DD705E"></path>
+                        <path d="M16.1450548,2.90686913 C12.4052466,2.7474126 7.79424658,-2.8264787 3.85183562,2.25723144 C1.18820548,5.69086188 10.6366438,8.71344884 13.6887945,8.05318072" fill="#000000"></path>
+                        <path d="M10.3124795,10.7261445 C16.0783151,9.84618072 18.7622055,10.8879633 20.1208356,8.64021695 C23.0752603,3.75376043 15.263137,1.27568797 12.6900822,3.30846333" fill="#000000"></path>
+                        <path d="M11.5721918,9.29221695 C7.95990411,10.1958039 6.48924658,14.0487459 5.01143836,16.1334923 C1.76621918,9.76940536 3.06287671,2.53480391 11.3457534,1.59223869" fill="#000000"></path>
+                        <path d="M6.54049315,10.5619633 C2.92939726,11.4643691 1.8889726,14.6464126 2.20121918,17.3807967 C-1.04280822,11.0155285 0.140630137,0.595340141 5.60613699,2.06115898" fill="#000000"></path>
+                    </g>
+                </g>
+                <path d="M21.5628904,40.0496083 C21.9073151,39.6291155 22.3184795,39.2830358 22.7737397,39.0562532 C23.5710411,38.654659 24.3242466,38.7160793 24.8617397,39.136572 C25.2729041,38.240072 25.9414932,37.4640503 26.7423699,37.0624561 C27.1916712,36.8368546 27.627863,36.7612604 28.0223425,36.8085068 C28.8673151,36.9171735 29.5013425,37.6223256 29.6133699,38.7467894 C29.6467397,39.0668836 29.6312466,39.3964271 29.5776164,39.7247894 C29.3630959,42.240659 26.4730274,47.2877532 26.4730274,47.2877532 C26.4730274,47.2877532 21.3805479,46.2447894 20.7083836,44.1730358 C20.5975479,43.9273546 20.5224658,43.6426952 20.4902877,43.3214199 C20.3782603,42.1993184 20.8180274,40.9567387 21.5628904,40.0496083 Z" id="Shape" fill="#FF7373" fill-rule="nonzero"></path>
+                <g transform="translate(22.280626, 47.604304)" fill="#2D3B54" fill-rule="nonzero" id="Shape">
+                    <path d="M2.45597652,5.94005072 C2.22000391,5.9495 1.96853816,6.031 1.68489432,6.19636232 C1.23320939,6.50582609 0.847072407,6.98183333 0.547935421,7.58894928 C0.232113503,8.23386232 0.0747984344,8.96263768 0.0759902153,9.80952899 C0.142729941,10.5631087 0.336990215,11.1631377 0.652812133,11.5966232 C0.962675147,12.0159348 1.32020939,12.2876014 1.71230528,12.3962681 C2.08175734,12.5025725 2.47623679,12.6242319 2.89336008,12.765971 C3.27353816,12.8923551 3.51904501,13.2490652 3.644182,13.8337391 C3.72879843,14.3924275 3.67397652,14.7703986 3.61081213,14.9062319 C3.47971624,15.1767174 3.19964775,15.477913 2.89097652,15.707058 C2.57992172,15.8877754 2.01501761,15.9657319 1.05563405,15.2948333 C0.885209393,15.2440435 0.714784736,15.3361739 0.543168297,15.5688623 C0.454976517,15.6917029 0.296469667,15.9539203 0.223771037,16.3425217 C0.182058708,16.5574928 0.178483366,16.7452971 0.214236791,16.9023913 C0.24164775,17.0335 0.297661448,17.1386232 0.397771037,17.2342971 C0.864949119,17.5803768 1.26538748,17.7717246 1.61934638,17.8248768 C1.98999022,17.878029 2.40353816,17.7658188 2.87905871,17.4811594 C3.34504501,17.1575217 3.70138748,16.8197101 3.96834638,16.4511884 C4.06368885,16.3212609 4.14830528,16.1830652 4.22457926,16.0413261 C4.4891546,15.5357899 4.67626419,15.0125362 4.77994912,14.4869203 C4.87886693,13.9872899 4.8931683,13.4805725 4.81808611,12.9195217 C4.69056556,12.202558 4.49868885,11.6875725 4.24841487,11.3970072 C4.00529159,11.1147101 3.7121135,10.9115507 3.36888063,10.7934348 C3.04233268,10.6824058 2.70386693,10.5749203 2.35229159,10.4757029 C2.02931898,10.3835725 1.75759295,10.194587 1.54903131,9.9111087 C1.34881213,9.64298551 1.23797652,9.30044928 1.2200998,8.91657246 C1.2141409,8.53978261 1.26777104,8.33189855 1.33570254,8.25866667 C1.6241135,7.97282609 1.86366145,7.84053623 2.07579843,7.8617971 C2.3201135,7.88542029 2.59303131,8.00707971 2.87429159,8.22441304 C3.06736008,8.39095652 3.296182,8.11928986 3.38675734,7.99644928 L3.38675734,7.99526812 C3.47733268,7.87242754 3.55956556,7.71651449 3.61677104,7.56650725 C3.69304501,7.38933333 3.80745597,7.04443478 3.73952446,6.73497101 C3.71926419,6.64047826 3.68351076,6.55543478 3.59651076,6.44558696 C3.05782583,6.09123913 2.69433268,5.92942029 2.45597652,5.94005072 Z"></path>
+                    <path d="M6.94899022,2.42492029 C6.3530998,2.83478261 5.83229159,3.586 5.45568885,4.58762319 C5.10292172,5.51955797 4.9241546,6.6511087 4.90151076,8.04723913 C4.88125049,9.18115217 4.97897652,10.239471 5.19230528,11.1973913 C5.4830998,12.5025725 5.90141487,13.3872609 6.4341409,13.825471 C6.98831898,14.2825797 7.6211546,14.2731304 8.32192172,13.7912174 C8.55074364,13.6258551 8.76883953,13.4108841 8.97144227,13.1522101 C9.14901761,13.454587 9.3671135,13.6884565 9.61500391,13.847913 C9.78185323,13.9825652 9.93678474,13.9943768 10.1012505,13.8798043 C10.1822916,13.8242899 10.2609491,13.743971 10.3372231,13.6364855 C10.4254149,13.5148261 10.5052642,13.366 10.5874971,13.1616594 C10.6971409,12.8687319 10.8353875,12.3313043 10.517182,11.9852246 C10.2478395,11.8647464 10.0297436,11.6745797 9.86408611,11.4135435 C10.1381957,10.5572029 10.2895519,9.57093478 10.3181546,8.41457971 C10.3503327,7.15546377 10.2502231,5.99556522 10.0214012,4.9715 C9.73894912,3.70765942 9.32420939,2.8465942 8.79148337,2.41547101 C8.23849706,1.96072464 7.61996282,1.96544928 6.94899022,2.42492029 Z M7.99060665,10.1508841 C7.86189432,10.3316014 7.75105871,10.5690145 7.68431898,10.817058 L7.64737378,11.0379348 C7.62353816,11.4229928 7.72245597,11.7147391 7.9381683,11.906087 L8.02755186,11.9320725 C8.13362035,11.9190797 8.23134638,11.9556957 8.32192172,12.0336522 C7.91790802,12.2816957 7.5341546,12.2533478 7.17662035,11.9438841 C6.77737378,11.5989855 6.45797652,10.8961957 6.22677104,9.85441304 C6.05634638,9.09256522 5.97530528,8.25394203 5.98245597,7.36098551 C5.98960665,6.14557246 6.14572994,5.45813768 6.27563405,5.09197826 C6.35905871,4.8581087 6.45201761,4.67148551 6.55689432,4.5262029 C6.64746967,4.401 6.75592172,4.29587681 6.87748337,4.21083333 C7.28030528,3.93680435 7.67478474,3.95688406 8.04781213,4.2817029 C8.44467515,4.62187681 8.7581135,5.30222464 8.97859295,6.29912319 C9.16451076,7.12593478 9.2491272,8.05196377 9.23601761,9.05122464 C9.22886693,9.50951449 9.20145597,9.88866667 9.15974364,10.2016739 C8.98693542,9.99497101 8.8081683,9.87331159 8.61986693,9.8296087 C8.53763405,9.8118913 8.28140117,9.75047101 7.99060665,10.1508841 Z"></path>
+                    <path d="M15.0435656,8.07794928 L14.9565656,8.13346377 C14.2653327,8.70750725 13.5669491,9.22839855 12.8363875,9.71976087 L12.0057162,0.605934783 C11.9330176,0.153550725 11.7101546,0.138195652 11.5361546,0.20315942 L11.4646477,0.2445 C11.3716888,0.311826087 11.2834971,0.401594203 11.202456,0.511442029 C11.0153464,0.770115942 10.8175108,1.23076812 10.8735245,1.65598551 L11.7554423,10.9564348 C11.762593,10.9942319 11.7685519,11.0343913 11.7792779,11.0757319 C11.8186067,11.2564493 11.8972642,11.4111812 12.0259765,11.5529203 C12.1928258,11.7182826 12.3894697,11.7277319 12.6230587,11.5753623 C13.4298943,11.0072246 14.2426888,10.3942029 15.041182,9.7481087 L15.1162642,9.68668841 L15.1889628,9.5792029 C15.3069491,9.41147826 15.5619902,8.965 15.4320861,8.39331884 C15.3427025,8.10747826 15.2187573,8.00471739 15.0435656,8.07794928 Z"></path>
+                </g>
+                <path d="M28.5526849,15.8405648 C28.5526849,15.8405648 29.3476027,18.7722025 29.1485753,19.7502025 C28.9507397,20.7270213 26.5063973,20.0301372 26.5063973,20.0301372 L28.5526849,15.8405648 Z" id="Shape" fill="#EF9D97" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>