Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop

Conflicts:
	libjsqrc/ethereumjs/.travis.yml
	libjsqrc/ethereumjs/README.md
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/lib/abi.js
	libjsqrc/ethereumjs/package.json

test/abi.parsers.js

@@ -0,0 +1,37 @@
+var assert = require('assert');
+var abi = require('../lib/abi.js');
+
+describe('abi', function() {
+    describe('inputParser', function() {
+        it('should parse ...', function() {
+
+            var desc =  [{
+                "name": "multiply",
+                "inputs": [
+                {
+                    "name": "a",
+                    "type": "uint256"
+                }
+                ],
+                "outputs": [
+                {
+                    "name": "d",
+                    "type": "uint256"
+                }
+                ]
+            }];
+
+            var iParser = abi.inputParser(desc);
+            assert.equal(iParser.multiply(1), "0x000000000000000000000000000000000000000000000000000000000000000001");
+
+        });
+    });
+
+
+    describe('outputParser', function() {
+        it('parse ...', function() {
+
+        });
+    });
+});
+