Merge branch 'develop' into cpp

Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/local.js b/lib/local.js
new file mode 100644
index 000000000..30cd14df2
--- /dev/null
+++ b/lib/local.js
@@ -0,0 +1,18 @@
+var addressName = {"0x12378912345789": "Gav", "0x57835893478594739854": "Jeff"};
+var nameAddress = {};
+
+for (var prop in addressName) {
+  if (addressName.hasOwnProperty(prop)) {
+    nameAddress[addressName[prop]]  = prop;
+  }
+}
+
+var local = {
+  addressBook:{
+    byName: addressName,
+    byAddress: nameAddress
+  }
+};
+
+if (typeof(module) !== "undefined")
+    module.exports = local;