Merge branch 'develop' into dependabot/npm_and_yarn/@commitlint/cli-7.0.0

diff --cc package-lock.json
Simple merge

diff --cc package.json
index f74f86c6edd0082d2379b14dad6a19264b296cb1,bb46e66de98208bf6596330eb6911d58d72bc756..574f3efb8420c0a6572ef99643ad2356ac1fa52c
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -32,8 -32,8 +32,8 @@@
    "devDependencies": {
      "@babel/core": "7.0.0-beta.44",
      "@babel/preset-env": "7.0.0-beta.44",
 -    "@commitlint/cli": "^6.1.3",
 +    "@commitlint/cli": "^7.0.0",
-     "@commitlint/config-conventional": "^6.1.3",
+     "@commitlint/config-conventional": "^7.0.1",
      "array-uniq": "^2.0.0",
      "autoprefixer": "^8.2.0",
      "babel-loader": "^8.0.0-beta.0",

diff --cc yarn.lock
index aab390074226ba157f2d4316307e459bfb7a417a,2b529ebe39977176a5e1fc942e15d963feb4d9e2..7f4d9d200c0f84279044479afa88de0ab95595d7
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -511,15 -511,15 +511,15 @@@
      get-stdin "5.0.1"
      lodash.merge "4.6.1"
      lodash.pick "4.4.0"
 -    meow "4.0.0"
 +    meow "^5.0.0"
  
- "@commitlint/config-conventional@^6.1.3":
-   version "6.1.3"
-   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-6.1.3.tgz#6c06eeae04c5ac789c3618df4d52aeda89ffb810"
+ "@commitlint/config-conventional@^7.0.1":
+   version "7.0.1"
+   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.0.1.tgz#276977f8ee60d8c56d7fdd43296af76dfee9b5f7"
  
 -"@commitlint/ensure@^6.1.3":
 -  version "6.1.3"
 -  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-6.1.3.tgz#813b58c9fdfae15351b72fe646a162ebdb71ea2a"
 +"@commitlint/ensure@^7.0.0":
 +  version "7.0.0"
 +  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-7.0.0.tgz#3d5210bb988416844926895a782a55815731779d"
    dependencies:
      lodash.camelcase "4.3.0"
      lodash.kebabcase "4.1.1"