diff --git a/package-lock.json b/package-lock.json
index 4528015f1..5595a78f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,15 +62,16 @@
       }
     },
     "@firebase/analytics": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.2.17.tgz",
-      "integrity": "sha512-5/b3DdRmFdhuqWufk9qrFms0fjDEYIDt/dMNJ3BFNPF+j4Uo89q8DPT71vxgXdx1Dsj4aJENFmrxSRpLe3n8sQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.3.0.tgz",
+      "integrity": "sha512-EEHuK+OcWH6UxufRLVU3lAJ4rmm7aVHmcgkhE9ZQJQy5c+w7QTLvVpGqtrpqD+cYyIBJkFBKJB8NziVyqKwQHw==",
       "dev": true,
       "requires": {
-        "@firebase/analytics-types": "0.2.8",
-        "@firebase/component": "0.1.7",
-        "@firebase/installations": "0.4.5",
-        "@firebase/util": "0.2.42",
+        "@firebase/analytics-types": "0.3.0",
+        "@firebase/component": "0.1.8",
+        "@firebase/installations": "0.4.6",
+        "@firebase/logger": "0.2.0",
+        "@firebase/util": "0.2.43",
         "tslib": "1.11.1"
       },
       "dependencies": {
@@ -83,21 +84,21 @@
       }
     },
     "@firebase/analytics-types": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.2.8.tgz",
-      "integrity": "sha512-7djG+mVLubSFy5ZEf8Gyn7XzrsLvpXCRj+vj6ta3KtwF2iCsOG4HvGv1TiU+sNwR017cAm2F0qmaAMac90Qq0g==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.3.0.tgz",
+      "integrity": "sha512-0AJ6xn53Qn0D/YOVHHvlWFfnzzRSdd98Lr8Oqe1PJ2HPIN+o7qf03YmOG7fLpR1uplcWd+7vGKmxUrN3jKUBwg==",
       "dev": true
     },
     "@firebase/app": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.5.6.tgz",
-      "integrity": "sha512-FzO0dgIXQgLFOETdM3p6zMdGTee+hnOUqU0KC24n8+gqX833atGX4Vrc47H53EAiR7sW6ESHsyAfJcvGPBi37Q==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.0.tgz",
+      "integrity": "sha512-utFL07aO64ZVs9g79cv1KHomtLdKkkAeKN5e8G9NlXXuO6dZXhcHLbOmKY1AfwrkAvUzPEKkFFY3dytOIt+nlg==",
       "dev": true,
       "requires": {
-        "@firebase/app-types": "0.5.3",
-        "@firebase/component": "0.1.7",
-        "@firebase/logger": "0.1.37",
-        "@firebase/util": "0.2.42",
+        "@firebase/app-types": "0.6.0",
+        "@firebase/component": "0.1.8",
+        "@firebase/logger": "0.2.0",
+        "@firebase/util": "0.2.43",
         "dom-storage": "2.1.0",
         "tslib": "1.11.1",
         "xmlhttprequest": "1.8.0"
@@ -112,15 +113,15 @@
       }
     },
     "@firebase/app-types": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.5.3.tgz",
-      "integrity": "sha512-PH1egwhlEhZSp7/jiUNszG1BX1NBUuL86Zd1ZoXT3qaFS9YSGGEY7n0DKgI0fWoVa5GzfbzKOC+J1e4T/+PY1Q==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.0.tgz",
+      "integrity": "sha512-ld6rzjXk/SUauHiQZJkeuSJpxIZ5wdnWuF5fWBFQNPaxsaJ9kyYg9GqEvwZ1z2e6JP5cU9gwRBlfW1WkGtGDYA==",
       "dev": true
     },
     "@firebase/auth": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.14.0.tgz",
-      "integrity": "sha512-3g3VylIUwNzzQ9xhfF5b+M3W+51bcvvbz+J/u9oXcvEvmy+MC1jJVrTYdQ5zg5vt+PrKzpRCY28N+uVcDO+Dug==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.14.1.tgz",
+      "integrity": "sha512-LE+QED10cjp28jJ7wwIY58HQBXoJioEWiQy7iQS8Fo2UxHGY5BvGjwnxX4yyszQPbcZZRLDSlBIUaYfog+rdEA==",
       "dev": true,
       "requires": {
         "@firebase/auth-types": "0.10.0"
@@ -139,12 +140,12 @@
       "dev": true
     },
     "@firebase/component": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.7.tgz",
-      "integrity": "sha512-FAoi1ELlrVY9Uy9zzTlhc+3nn5VdYe36C/OpDnFXb2K/AH0jR6wcVTvLqGYFBPFVjgqO5MKCn3Mq3DCnro8QGg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.8.tgz",
+      "integrity": "sha512-kzuCF+NVympQk3gcsHldOmDRVPVndECi6O9Wvd47HTEQYO9HsZWfOM1fHUvvHAijSzNi16p4NSM7UziuBQBL4w==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "tslib": "1.11.1"
       },
       "dependencies": {
@@ -157,16 +158,16 @@
       }
     },
     "@firebase/database": {
-      "version": "0.5.23",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.23.tgz",
-      "integrity": "sha512-6zVa3dJoUT8bpiSai/aIbGPEDrGaFwR1iMMmXCYSf6su46ZYMLOYjSV/+nOHZaT4/TyQZY3D+iIL0WyRuEVOjA==",
+      "version": "0.5.24",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.24.tgz",
+      "integrity": "sha512-9whAQzU8cxDUKGBWCT/aHVmqfyzCP2RkGhbZi2oHpMrmvht7cuBtXtUbDD5R8WomniCOUP8rtQfmCFI7V9ehYw==",
       "dev": true,
       "requires": {
         "@firebase/auth-interop-types": "0.1.4",
-        "@firebase/component": "0.1.7",
-        "@firebase/database-types": "0.4.13",
-        "@firebase/logger": "0.1.37",
-        "@firebase/util": "0.2.42",
+        "@firebase/component": "0.1.8",
+        "@firebase/database-types": "0.4.14",
+        "@firebase/logger": "0.2.0",
+        "@firebase/util": "0.2.43",
         "faye-websocket": "0.11.3",
         "tslib": "1.11.1"
       },
@@ -180,25 +181,25 @@
       }
     },
     "@firebase/database-types": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.13.tgz",
-      "integrity": "sha512-7bDsD90Q9YmmB/A90UnZLv7jqgULClxAT1C4aw1dGfcS49XEUh2uuoW3NqS5vvtbMHJiurrN73ADddwgCrltww==",
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.14.tgz",
+      "integrity": "sha512-+D41HWac0HcvwMi+0dezEdSOZHpVjPKPNmpQiW2GDuS5kk27/v1jxc9v7F4ALLtpxbVcn16UZl5PqEkcS9H2Xg==",
       "dev": true,
       "requires": {
-        "@firebase/app-types": "0.5.3"
+        "@firebase/app-types": "0.6.0"
       }
     },
     "@firebase/firestore": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.12.1.tgz",
-      "integrity": "sha512-HE++zHqOtLb/N7bhsiBR5uzBnHPVmEunz2vMC/jaJSIR/oBYVTIanMTzUxzOavUrII/9wnqFw3R2p0CY/CD9ow==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.13.0.tgz",
+      "integrity": "sha512-GctO+sxLqOnY8SkBN5Z5p1nUYRX+yWSc9Kcx9nIPbUZ0WqBM5BaSlBHZHTFtjmJxS+0j/Y8Mu7c6qm6q5rVnjA==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
+        "@firebase/component": "0.1.8",
         "@firebase/firestore-types": "1.10.1",
-        "@firebase/logger": "0.1.37",
-        "@firebase/util": "0.2.42",
-        "@firebase/webchannel-wrapper": "0.2.37",
+        "@firebase/logger": "0.2.0",
+        "@firebase/util": "0.2.43",
+        "@firebase/webchannel-wrapper": "0.2.38",
         "@grpc/proto-loader": "^0.5.0",
         "grpc": "1.24.2",
         "tslib": "1.11.1"
@@ -219,12 +220,12 @@
       "dev": true
     },
     "@firebase/functions": {
-      "version": "0.4.37",
-      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.37.tgz",
-      "integrity": "sha512-nNIW6KEQ8V0JVFlwSfJUs10LJIr3pjltSVA3ulDow3SeYl+VO+1tKsZUaG59CCSqHCIDkJJ3quBpFK36v141vQ==",
+      "version": "0.4.38",
+      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.38.tgz",
+      "integrity": "sha512-t5QkJg251FmIEEi2mh3Xrf7Q3yonSLRaUW/vhgze7A3Xy3uTIUT3BVNWuKaRmg1n0PgKQaBHCjlDoLJAdSpujg==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
+        "@firebase/component": "0.1.8",
         "@firebase/functions-types": "0.3.16",
         "@firebase/messaging-types": "0.4.4",
         "isomorphic-fetch": "2.2.1",
@@ -246,14 +247,14 @@
       "dev": true
     },
     "@firebase/installations": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.5.tgz",
-      "integrity": "sha512-mIWpG9r98fiuh6yc0mPSoXzw/UV7UVSuvxpIqrdBT7P2o3ADDH1usyTq6QhSmb94HJhSG3QTj7VdV9wu/rcy7w==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.6.tgz",
+      "integrity": "sha512-ey8cE2ldRO4pYqg0lCWQ+XFLETHZWha3Hw1CnYJjLivk4FMM8u/es3Oa257wwtYXAUfr0UsPDfHFgYME9E9EhA==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
+        "@firebase/component": "0.1.8",
         "@firebase/installations-types": "0.3.3",
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "idb": "3.0.2",
         "tslib": "1.11.1"
       },
@@ -273,21 +274,21 @@
       "dev": true
     },
     "@firebase/logger": {
-      "version": "0.1.37",
-      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.37.tgz",
-      "integrity": "sha512-uiVVfVlhCZLfUBqOCUuh8V3t+8lKTFJ6mgDoH99YFbuWYUUch8OHWQG70qg/I6m7IRIZLtHyPt3OCxYgI0R6Yw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.0.tgz",
+      "integrity": "sha512-qOMnAh1JY9NkYUEy3iFviiFq0dCvk6qN2DsRy2Y7eAhHR6RqwA47l1kI+0MIXmSzlJ9akXjWAXxV5ijzr68Big==",
       "dev": true
     },
     "@firebase/messaging": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.6.9.tgz",
-      "integrity": "sha512-MIkvpD56JX8NhcrWYI1DsgOUyEq/NpkdecqxeJx6IUK64W4GmJW7Msh3xGrvHpRetoErjM6OqKYzlJqEixL6wg==",
+      "version": "0.6.10",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.6.10.tgz",
+      "integrity": "sha512-WYnKEffG6m0EMHzib8KCWVUGno1cuBC13RrOfGWOCv/whdy9QCIZgMxH/NsY3BrYst8FnjuXEU16fi5AEf4qbg==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
-        "@firebase/installations": "0.4.5",
+        "@firebase/component": "0.1.8",
+        "@firebase/installations": "0.4.6",
         "@firebase/messaging-types": "0.4.4",
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "idb": "3.0.2",
         "tslib": "1.11.1"
       },
@@ -307,16 +308,16 @@
       "dev": true
     },
     "@firebase/performance": {
-      "version": "0.2.35",
-      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.35.tgz",
-      "integrity": "sha512-FMHjxfy/8E1Y9aurLS0sEpPII2xsNiYAantFS95IwXvVAa2cpnZFCzOn/XUT2ytfuxgUo2Ly4gOvplcI07oE5w==",
+      "version": "0.2.36",
+      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.36.tgz",
+      "integrity": "sha512-nMx3gT+ZD86MV5n460XFA1o75YYMGcs2MXrJa462rfUQtqOrtOOvdUvVtmE6cLrHsL4Y83B+VBWKHzACIPghPw==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
-        "@firebase/installations": "0.4.5",
-        "@firebase/logger": "0.1.37",
+        "@firebase/component": "0.1.8",
+        "@firebase/installations": "0.4.6",
+        "@firebase/logger": "0.2.0",
         "@firebase/performance-types": "0.0.12",
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "tslib": "1.11.1"
       },
       "dependencies": {
@@ -335,9 +336,9 @@
       "dev": true
     },
     "@firebase/polyfill": {
-      "version": "0.3.32",
-      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.32.tgz",
-      "integrity": "sha512-Q6n7s3YAKI1xpBUBKOoDqC2i4bTYEZ2BLDgwhkWF+aMi0pWrhODDrV50s/Cza1Z2quaWu3jCZ0Bg9TzG1+zGbg==",
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.33.tgz",
+      "integrity": "sha512-Arp9JViyD2i0K01NCCY0WZK5p16kQB/wddf44+Qboh+u3eIrFbVk0OO2IknjrkzIW392u73Ts7TkVxLPGPJF9g==",
       "dev": true,
       "requires": {
         "core-js": "3.6.4",
@@ -360,16 +361,16 @@
       }
     },
     "@firebase/remote-config": {
-      "version": "0.1.16",
-      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.16.tgz",
-      "integrity": "sha512-Fo6fPJ/e5MsU8AZtFcS/5JMvU+wcb4Mf0SSIclhwWaX8JKePYF0TG92pbGoSs9RdsdxxlzXIQjtcvmi40eMN6Q==",
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.17.tgz",
+      "integrity": "sha512-jIRHXih0krVTNGYMewFVIaX8WPE1iS06fV4oMMHCCSSforGodv535uVZZ41Il29Q+22zOcyJvahoc990V0cFoA==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
-        "@firebase/installations": "0.4.5",
-        "@firebase/logger": "0.1.37",
+        "@firebase/component": "0.1.8",
+        "@firebase/installations": "0.4.6",
+        "@firebase/logger": "0.2.0",
         "@firebase/remote-config-types": "0.1.8",
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "tslib": "1.11.1"
       },
       "dependencies": {
@@ -388,14 +389,14 @@
       "dev": true
     },
     "@firebase/storage": {
-      "version": "0.3.29",
-      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.29.tgz",
-      "integrity": "sha512-vFNq282bbVXytSDUvyD2NYOodtB9fXmKUNgWNQxUAcXGBMJXq1NSLrmfetAS+kPTs2ejUS/VUdW7BlSfYyAF3Q==",
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.30.tgz",
+      "integrity": "sha512-wapt4+NiEqTiLKPpsy+XbdLTN99pkqjf46Z7zqeS+vh+61cJsUT8M7YBfBb0ZN+dY6gnI5QNzviiKpykhJQbVA==",
       "dev": true,
       "requires": {
-        "@firebase/component": "0.1.7",
+        "@firebase/component": "0.1.8",
         "@firebase/storage-types": "0.3.11",
-        "@firebase/util": "0.2.42",
+        "@firebase/util": "0.2.43",
         "tslib": "1.11.1"
       },
       "dependencies": {
@@ -414,9 +415,9 @@
       "dev": true
     },
     "@firebase/util": {
-      "version": "0.2.42",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.42.tgz",
-      "integrity": "sha512-ihFavcy7OdSMwZySidRSi58RkiqVVcmVAVy2J5VSKWaCQcBL8+4+H0ytmmXplxKCaQAsyqj1XhJx+MaCJyXknQ==",
+      "version": "0.2.43",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.43.tgz",
+      "integrity": "sha512-4gGlvcoOJ48xO6PH59UOHLjvImdYXANF/1d0ao60fbiJDIKxJqMksXw3UF2zsUrRkyCOqIDLeiVuF18vffXP+g==",
       "dev": true,
       "requires": {
         "tslib": "1.11.1"
@@ -431,9 +432,9 @@
       }
     },
     "@firebase/webchannel-wrapper": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.37.tgz",
-      "integrity": "sha512-jreLH4/jlrULywKPQKMCjNGKY/ynZPZxiM8T6vD+JxpjOBqtXWcuBEzOktcQ5lWs3BlRi77NHOTLs23hkFXZiQ==",
+      "version": "0.2.38",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.38.tgz",
+      "integrity": "sha512-mp1XmAJsuqaSWm5WQYo7R0zfZWe9EmwMCxsxkKr+ubLOumyNy4NG5aV45hEpFTosQv4myXpiCiS4GFE9mNqLZQ==",
       "dev": true
     },
     "@grpc/proto-loader": {
@@ -713,13 +714,13 @@
       }
     },
     "@openzeppelin/cli": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/cli/-/cli-2.7.2.tgz",
-      "integrity": "sha512-YvY7GluoXdT5Vbotv0Zyo/2M7hHM5/BvDyNA5LJt8J2qsXmeBTGLB+/YmCnb+vS4E1ANS/cMioCHwOid+qaqbA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/cli/-/cli-2.8.0.tgz",
+      "integrity": "sha512-8Jlz9+LGXkI+21fJwFXF8JcFWL0oT4/c9yIMnsT2L4IL78t1jncNIQKC4zG8P8bAjZiDGsuHrelYB3N4xfc0kA==",
       "dev": true,
       "requires": {
         "@openzeppelin/fuzzy-solidity-import-parser": "^0.1.2",
-        "@openzeppelin/upgrades": "^2.7.2",
+        "@openzeppelin/upgrades": "2.8.0",
         "@types/fs-extra": "^7.0.0",
         "@types/npm": "^2.0.29",
         "@types/semver": "^5.5.0",
@@ -738,45 +739,6 @@
         "inquirer": "^6.4.1",
         "is-url": "^1.2.4",
         "lockfile": "^1.0.4",
-        "lodash.castarray": "^4.4.0",
-        "lodash.compact": "^3.0.1",
-        "lodash.concat": "^4.5.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.every": "^4.6.0",
-        "lodash.filter": "^4.6.0",
-        "lodash.find": "^4.6.0",
-        "lodash.findindex": "^4.6.0",
-        "lodash.flatmap": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.foreach": "^4.5.0",
-        "lodash.frompairs": "^4.0.1",
-        "lodash.groupby": "^4.6.0",
-        "lodash.intersection": "^4.4.0",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
-        "lodash.isnil": "^4.0.0",
-        "lodash.isnull": "^3.0.0",
-        "lodash.isstring": "^4.0.1",
-        "lodash.isundefined": "^3.0.1",
-        "lodash.map": "^4.6.0",
-        "lodash.mapvalues": "^4.6.0",
-        "lodash.max": "^4.0.1",
-        "lodash.maxby": "^4.6.0",
-        "lodash.merge": "^4.6.1",
-        "lodash.negate": "^3.0.2",
-        "lodash.omit": "^4.5.0",
-        "lodash.omitby": "^4.6.0",
-        "lodash.partition": "^4.6.0",
-        "lodash.pick": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.reverse": "^4.0.1",
-        "lodash.sortby": "^4.7.0",
-        "lodash.topairs": "^4.3.0",
-        "lodash.uniq": "^4.5.0",
-        "lodash.uniqby": "^4.7.0",
-        "lodash.uniqwith": "^4.5.0",
-        "lodash.zipwith": "^4.2.0",
         "npm-programmatic": "0.0.12",
         "rlp": "^2.2.3",
         "semver": "^5.5.0",
@@ -1891,9 +1853,9 @@
       }
     },
     "@openzeppelin/upgrades": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades/-/upgrades-2.7.2.tgz",
-      "integrity": "sha512-RU63TpSLNRjoeC6M4IeaEA3lI8UP6DdWF5L+gru9uExU+A/OvrhfepHfNd5lFQtkCB77oQ2I1wauE75K5a/ysg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades/-/upgrades-2.8.0.tgz",
+      "integrity": "sha512-LzjTQPeljPsgHDPdZyH9cMCbIHZILgd2cpNcYEkdsC2IylBYRHShlbEDXJV9snnqg9JWfzPiKIqyj3XVliwtqQ==",
       "dev": true,
       "requires": {
         "@types/cbor": "^2.0.0",
@@ -1903,27 +1865,7 @@
         "chalk": "^2.4.1",
         "ethers": "^4.0.20",
         "glob": "^7.1.3",
-        "lodash.concat": "^4.5.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.every": "^4.6.0",
-        "lodash.findlast": "^4.6.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.includes": "^4.3.0",
-        "lodash.invertby": "^4.7.0",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
-        "lodash.isstring": "^4.0.1",
-        "lodash.keys": "^4.2.0",
-        "lodash.map": "^4.6.0",
-        "lodash.omit": "^4.5.0",
-        "lodash.pick": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.random": "^3.2.0",
-        "lodash.reverse": "^4.0.1",
-        "lodash.some": "^4.6.0",
-        "lodash.uniq": "^4.5.0",
-        "lodash.values": "^4.3.0",
-        "lodash.without": "^4.4.0",
+        "lodash": "^4.17.15",
         "semver": "^5.5.1",
         "spinnies": "^0.4.2",
         "truffle-flattener": "^1.4.0",
@@ -2019,6 +1961,12 @@
           "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
           "dev": true
         },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        },
         "mimic-fn": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -3933,9 +3881,9 @@
       }
     },
     "@types/prettier": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.0.tgz",
-      "integrity": "sha512-gDE8JJEygpay7IjA/u3JiIURvwZW08f0cZSZLAzFoX/ZmeqvS0Sqv+97aKuHpNsalAMMhwPe+iAS6fQbfmbt7A==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
+      "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
       "dev": true
     },
     "@types/resolve": {
@@ -7527,25 +7475,25 @@
       }
     },
     "firebase": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.11.0.tgz",
-      "integrity": "sha512-8grsK7aSu1WmaVzxkueOylqZJM7Gf2S4OZO5gQRYwvPnmCsnjfKkSbPrxlEt5znyKuAOgud0ECUXFpj/e0OBtg==",
-      "dev": true,
-      "requires": {
-        "@firebase/analytics": "0.2.17",
-        "@firebase/app": "0.5.6",
-        "@firebase/app-types": "0.5.3",
-        "@firebase/auth": "0.14.0",
-        "@firebase/database": "0.5.23",
-        "@firebase/firestore": "1.12.1",
-        "@firebase/functions": "0.4.37",
-        "@firebase/installations": "0.4.5",
-        "@firebase/messaging": "0.6.9",
-        "@firebase/performance": "0.2.35",
-        "@firebase/polyfill": "0.3.32",
-        "@firebase/remote-config": "0.1.16",
-        "@firebase/storage": "0.3.29",
-        "@firebase/util": "0.2.42"
+      "version": "7.13.1",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.13.1.tgz",
+      "integrity": "sha512-v4Z7Wioy/7LMC8RJn1jNlOaUqLK7bUEva+Uf+qrbtFd7hM2rWLW+0IqHZBwPrQ5tI604uHj7IlhqAZEjm38AMw==",
+      "dev": true,
+      "requires": {
+        "@firebase/analytics": "0.3.0",
+        "@firebase/app": "0.6.0",
+        "@firebase/app-types": "0.6.0",
+        "@firebase/auth": "0.14.1",
+        "@firebase/database": "0.5.24",
+        "@firebase/firestore": "1.13.0",
+        "@firebase/functions": "0.4.38",
+        "@firebase/installations": "0.4.6",
+        "@firebase/messaging": "0.6.10",
+        "@firebase/performance": "0.2.36",
+        "@firebase/polyfill": "0.3.33",
+        "@firebase/remote-config": "0.1.17",
+        "@firebase/storage": "0.3.30",
+        "@firebase/util": "0.2.43"
       }
     },
     "flat": {
@@ -31096,252 +31044,24 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
       "dev": true
     },
-    "lodash.castarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
-      "integrity": "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=",
-      "dev": true
-    },
     "lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
       "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
       "dev": true
     },
-    "lodash.compact": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.compact/-/lodash.compact-3.0.1.tgz",
-      "integrity": "sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=",
-      "dev": true
-    },
-    "lodash.concat": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.concat/-/lodash.concat-4.5.0.tgz",
-      "integrity": "sha1-sFOuAuSoAIWC5yVrnQK9ptA4A5U=",
-      "dev": true
-    },
-    "lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
-      "dev": true
-    },
-    "lodash.every": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.every/-/lodash.every-4.6.0.tgz",
-      "integrity": "sha1-64mYS+vENkJ5uzrvu9HKGb+mxqc=",
-      "dev": true
-    },
-    "lodash.filter": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-      "dev": true
-    },
-    "lodash.find": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz",
-      "integrity": "sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=",
-      "dev": true
-    },
-    "lodash.findindex": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz",
-      "integrity": "sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=",
-      "dev": true
-    },
-    "lodash.findlast": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.findlast/-/lodash.findlast-4.6.0.tgz",
-      "integrity": "sha1-6ou3jPLn54BPyK630ZU+B/4x+8g=",
-      "dev": true
-    },
-    "lodash.flatmap": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz",
-      "integrity": "sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=",
-      "dev": true
-    },
     "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
       "dev": true
     },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "lodash.foreach": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-      "dev": true
-    },
-    "lodash.frompairs": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz",
-      "integrity": "sha1-vE5SB/onV8E25XNhTpZkUGsrG9I=",
-      "dev": true
-    },
-    "lodash.groupby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
-      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=",
-      "dev": true
-    },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=",
-      "dev": true
-    },
-    "lodash.intersection": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz",
-      "integrity": "sha1-ChG6Yx0OlcI8fy9Mu5ppLtF45wU=",
-      "dev": true
-    },
-    "lodash.invertby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.invertby/-/lodash.invertby-4.7.0.tgz",
-      "integrity": "sha1-zeu2zUlCqmuN8sdL4cXZSGgnGLA=",
-      "dev": true
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-      "dev": true
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
-    },
-    "lodash.isnil": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz",
-      "integrity": "sha1-SeKM1VkBNFjIFMVHnTxmOiG/qmw=",
-      "dev": true
-    },
-    "lodash.isnull": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
-      "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4=",
-      "dev": true
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-      "dev": true
-    },
-    "lodash.isundefined": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",
-      "integrity": "sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz",
-      "integrity": "sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU=",
-      "dev": true
-    },
-    "lodash.map": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-      "dev": true
-    },
-    "lodash.mapvalues": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-      "dev": true
-    },
-    "lodash.max": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz",
-      "integrity": "sha1-hzVWbGGLNan3YFILSHrnllivE2o=",
-      "dev": true
-    },
-    "lodash.maxby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.maxby/-/lodash.maxby-4.6.0.tgz",
-      "integrity": "sha1-CCJABo88eiJ6oAqDgOTzjPB4bj0=",
-      "dev": true
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.negate": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.negate/-/lodash.negate-3.0.2.tgz",
-      "integrity": "sha1-nIl7C/YQAZ4LQ7j/Pwr+89e2bzQ=",
-      "dev": true
-    },
-    "lodash.omit": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=",
-      "dev": true
-    },
-    "lodash.omitby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.omitby/-/lodash.omitby-4.6.0.tgz",
-      "integrity": "sha1-XBX/R1StVVAWtTwEExHo8HkgR5E=",
-      "dev": true
-    },
-    "lodash.partition": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.partition/-/lodash.partition-4.6.0.tgz",
-      "integrity": "sha1-o45GtzRp4EILDaEhLmbUFL42S6Q=",
-      "dev": true
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-      "dev": true
-    },
-    "lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "dev": true
-    },
-    "lodash.random": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.random/-/lodash.random-3.2.0.tgz",
-      "integrity": "sha1-luJOdjMzGZEw0sni/Vf5FwPMJi0=",
-      "dev": true
-    },
-    "lodash.reverse": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.reverse/-/lodash.reverse-4.0.1.tgz",
-      "integrity": "sha1-Hyr+2s4uFuZg86p8WdMwCm8l0Tw=",
-      "dev": true
-    },
-    "lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-      "dev": true
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "lodash.startcase": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
@@ -31367,48 +31087,6 @@
         "lodash._reinterpolate": "^3.0.0"
       }
     },
-    "lodash.topairs": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz",
-      "integrity": "sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ=",
-      "dev": true
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "lodash.uniqby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-      "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=",
-      "dev": true
-    },
-    "lodash.uniqwith": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz",
-      "integrity": "sha1-egy/ZfQ7WShiWp1NDcVLGMrcfvM=",
-      "dev": true
-    },
-    "lodash.values": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz",
-      "integrity": "sha1-o6bCsOvsxcLLocF+bmIP6BtT00c=",
-      "dev": true
-    },
-    "lodash.without": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz",
-      "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=",
-      "dev": true
-    },
-    "lodash.zipwith": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zipwith/-/lodash.zipwith-4.2.0.tgz",
-      "integrity": "sha1-r6zwP9LzhK8p4mPDxr2juA4/Uf0=",
-      "dev": true
-    },
     "log-symbols": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
diff --git a/package.json b/package.json
index 6e5a854bf..ba1748332 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://openzeppelin.com/contracts/",
   "devDependencies": {
-    "@openzeppelin/cli": "^2.7.2",
+    "@openzeppelin/cli": "^2.8.0",
     "@openzeppelin/docs-utils": "^0.1.0",
     "@openzeppelin/gsn-helpers": "^0.2.3",
     "@openzeppelin/gsn-provider": "^0.1.10",