Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into develop

Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js.map

dist/ethereum.js

@@ -289,6 +289,7 @@ module.exports = {
     methodSignature: methodSignature
 };
 
+
 },{}],2:[function(require,module,exports){
 /*
     This file is part of ethereum.js.

lib/abi.js

@@ -287,3 +287,4 @@ module.exports = {
     outputParser: outputParser,
     methodSignature: methodSignature
 };
+