Merge branch 'solidity_cmake' into js_abi
Merge branch 'osx_build_fix' into js_abi
Merge branch 'develop' into js_abi
js abi connection
merge
Merge branch 'develop' into js_abi

Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
contract create and contract call working
revert unnecessary changes in main.js
Merge branch 'develop' into js_abi
contract calls working from js
minified ethereum.js
removed unnecessary methods from jsonrpc and added contract call tests
Merge branch 'develop' into js_abi
added storageAt which dumps contract storage
Merge branch 'develop' into js_abi
storage dump test
improved js interface for contract calling
Merge branch 'develop' into js_abi
common changes after merge
Merge branch 'develop' into js_abi

Conflicts:
	libweb3jsonrpc/WebThreeStubServer.cpp