Merge pull request #407 from CJentzsch/bugfix

Revert previous changes because of wrong gas calculation in vm tests
web3, web3.eth, web3.shh for the JS API.
Following up on Whisper for the dream C++ API.
Crpyto stubs in ready for Alex.
stdserv.js updated to latest.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
eliminiate warning
Changing gas cost to zero at stackunderflow
Merge remote-tracking branch 'upstream/develop' into bugfix