Merge branch 'dev' into inversify

Conflicts:
	dist/index.js
	src/JavaScriptObfuscatorInternal.ts
	src/Obfuscator.ts
	src/interfaces/IObfuscator.d.ts

package.json

@@ -25,7 +25,7 @@
     "class-validator": "0.6.6",
     "commander": "2.9.0",
     "escodegen": "1.8.1",
-    "esprima": "3.1.1",
+    "esprima": "3.1.2",
     "estraverse": "4.2.0",
     "inversify": "^3.0.0-beta.2",
     "is-equal": "^1.5.3",
@@ -45,7 +45,7 @@
     "@types/joi": "9.0.33",
     "@types/mkdirp": "0.3.29",
     "@types/mocha": "2.2.33",
-    "@types/node": "6.0.49",
+    "@types/node": "6.0.51",
     "@types/sinon": "1.16.32",
     "@types/string-template": "^1.0.2",
     "awesome-typescript-loader": "^3.0.0-beta.9",
@@ -55,10 +55,10 @@
     "chai": "3.5.0",
     "coveralls": "2.11.15",
     "istanbul": "1.1.0-alpha.1",
-    "mocha": "3.1.2",
+    "mocha": "3.2.0",
     "sinon": "2.0.0-pre.3",
     "ts-node": "1.7.0",
-    "tslint": "4.0.1",
+    "tslint": "4.0.2",
     "typescript": "2.0.10",
     "webpack": "2.1.0-beta.27",
     "webpack-node-externals": "1.5.4"

src/interfaces/IObfuscator.d.ts

@@ -1,5 +1,8 @@
 import * as ESTree from 'estree';
 
+import { ICustomNode } from './custom-nodes/ICustomNode';
+import { IStorage } from './IStorage';
+
 export interface IObfuscator {
-    obfuscateAstTree (astTree: ESTree.Program): ESTree.Program;
+    obfuscateAstTree (astTree: ESTree.Program, customNodesStorage: IStorage<ICustomNode>): ESTree.Program;
 }