Merge branch 'development' into feature/addKovanFaucets

* development:
  Add new packages to main README
  Remove redundant totalSupply from token interface

3 files changed, 10 insertions, 5 deletions

diff --git a/README.md b/README.md
index cb15f791c..1c8cfb0da 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,15 @@ This repository contains all the 0x developer tools written in TypeScript. Our h
 | Package | Version | Description |
 |--------|-------|------------|
 | [`0x.js`](/packages/0x.js) | [![npm](https://img.shields.io/npm/v/0x.js.svg?maxAge=2592000)](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
-| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/assert) | Standard type and schema assertions |
 | [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the standard relayer api |
+| [`@0xproject/contracts`](/packages/contracts) | | Smart contracts |
+| [`@0xproject/website`](/packages/website) | | 0x website |
+| [`@0xproject/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/subproviders) | Web3 subproviders |
+| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS code from ABI |
+| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/assert) | Standard type and schema assertions |
 | [`@0xproject/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
+| [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | | Shared monorepo scripts |
 | [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x project TSLint rules |
+| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/types) | Shared types |
+| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/utils) | Shared utils |
+| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg?maxAge=2592000)](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
diff --git a/packages/contracts/contracts/tokens/Token_v2.sol b/packages/contracts/contracts/tokens/Token_v2.sol
index 027f706f4..e1088c560 100644
--- a/packages/contracts/contracts/tokens/Token_v2.sol
+++ b/packages/contracts/contracts/tokens/Token_v2.sol
@@ -2,9 +2,6 @@ pragma solidity 0.4.18;
 
 contract Token_v2 {
 
-    /// @return total amount of tokens
-    function totalSupply() public view returns (uint) {}
-
     /// @notice send `_value` token to `_to` from `msg.sender`
     /// @param _to The address of the recipient
     /// @param _value The amount of token to be transferred
diff --git a/packages/website/package.json b/packages/website/package.json
index d52cfc6ff..a6703af7e 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "website",
+  "name": "@0xproject/website",
   "version": "0.0.2",
   "private": true,
   "description": "Website and 0x portal dapp",