Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash

* v2-prototype:
  Temporarily disable installation tests
  Pin connect in sra-report
  Fix a typo
  Pin types in sra-report
  Fix linter issues
  Unpin types version in @0xproject/connect
  Pin types version in website
  Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages
  Migrate migrations to v2

# Conflicts:
#	packages/contracts/src/utils/order_utils.ts

1 files changed, 9 insertions, 2 deletions

diff --git a/packages/migrations/src/utils/token_info.ts b/packages/migrations/src/utils/token_info.ts
index e72a80220..7975c2174 100644
--- a/packages/migrations/src/utils/token_info.ts
+++ b/packages/migrations/src/utils/token_info.ts
@@ -1,8 +1,8 @@
 import { BigNumber, NULL_BYTES } from '@0xproject/utils';
 
-import { Token } from '../types';
+import { ERC20Token, ERC721Token } from '../types';
 
-export const tokenInfo: Token[] = [
+export const erc20TokenInfo: ERC20Token[] = [
     {
         name: 'Augur Reputation Token',
         symbol: 'REP',
@@ -39,3 +39,10 @@ export const tokenInfo: Token[] = [
         swarmHash: NULL_BYTES,
     },
 ];
+
+export const erc721TokenInfo: ERC721Token[] = [
+    {
+        name: 'CryptoKitties',
+        symbol: 'CK',
+    },
+];