Merge branch 'development' into removeMigrateStep

* development:
  Fix lint error
  Fix documentation links in some READMEs
  Fix relative link
  Add step to publishing that upload staging doc jsons, deploys staging website, opens every docs page and asks the dev to confirm that each one renders properly before publishing
  Fix web3Wrapper build command
  Add top-level `yarn lerna:stage_docs` to upload docJsons to the staging S3 bucket for all packages with a docs page
  Added a detailed description of `renameOverloadedMethods` (special thanks to @fabioberger). Updated Javascript styles in the Abi-Gen and Utils packages, around support for function overloading.
  Updated deployer to accept a list of contract directories as input. Contract directories are namespaced to a void clashes. Also in this commit is a fix for overloading contract functions.
  Refactor publish script to have it's main execution body be lean and discrete steps

# Conflicts:
#	packages/contracts/package.json
#	packages/deployer/package.json

1 files changed, 16 insertions, 3 deletions

diff --git a/packages/deployer/src/utils/types.ts b/packages/deployer/src/utils/types.ts
index 7d131f5ce..1a866b873 100644
--- a/packages/deployer/src/utils/types.ts
+++ b/packages/deployer/src/utils/types.ts
@@ -18,6 +18,11 @@ export interface ContractNetworks {
     [key: number]: ContractNetworkData;
 }
 
+export interface ContractDirectory {
+    path: string;
+    namespace: string;
+}
+
 export interface ContractNetworkData {
     solc_version: string;
     optimizer_enabled: boolean;
@@ -40,7 +45,7 @@ export interface SolcErrors {
 
 export interface CliOptions extends yargs.Arguments {
     artifactsDir: string;
-    contractsDir: string;
+    contractDirs: string;
     jsonrpcUrl: string;
     networkId: number;
     shouldOptimize: boolean;
@@ -51,7 +56,7 @@ export interface CliOptions extends yargs.Arguments {
 }
 
 export interface CompilerOptions {
-    contractsDir: string;
+    contractDirs: Set<ContractDirectory>;
     networkId: number;
     optimizerEnabled: boolean;
     artifactsDir: string;
@@ -78,7 +83,11 @@ export interface ContractSources {
     [key: string]: string;
 }
 
-export interface ContractSourceData {
+export interface ContractIdToSourceFileId {
+    [key: string]: string;
+}
+
+export interface ContractSourceDataByFileId {
     [key: string]: ContractSpecificSourceData;
 }
 
@@ -98,4 +107,8 @@ export interface Token {
     swarmHash: string;
 }
 
+export interface FunctionNameToSeenCount {
+    [key: string]: number;
+}
+
 export type DoneCallback = (err?: Error) => void;