Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype:
  Prettier fix
  Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility
  Fix missed merge conflicts
  Fix additional versions and update yarn.lock
  Add OrderWatcherConfig type to 0x.js docs page
  Export OrderWatcherConfig from 0x.js
  Update all package versions to match latest published to NPM
  Update CHANGELOG's with publishes performed on development branch
  Rebase with latest removing PROXY_ID from transfer
  Split transfer impl and AssetProxyMixin
  change @0xproject/types to ethereum-types
  remove mistaken comment
  workaround for TypeScript trailing comma bug
  Document contract_templates

1 files changed, 17 insertions, 0 deletions

diff --git a/packages/contract_templates/README.md b/packages/contract_templates/README.md
new file mode 100644
index 000000000..e5f4b09d1
--- /dev/null
+++ b/packages/contract_templates/README.md
@@ -0,0 +1,17 @@
+These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
+
+To successfully compile the generated TypeScript contract wrappers, you must:
+
+*   Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash`
+*   Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
+*   Ensure that your TypeScript configuration includes the following:
+
+```
+"compilerOptions": {
+  "lib": ["ES2015"],
+  "typeRoots": [
+    "node_modules/@0xproject/typescript-typings/types",
+    "node_modules/@types"
+  ]
+}
+```