Merge remote-tracking branch 'upstream/develop' into frontier/js

Godeps/Godeps.json

Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go

README.md

accounts/abi/numbers.go

accounts/abi/type.go

blockpool/blockpool.go

blockpool/blockpool_test.go

blockpool/blockpool_util_test.go

blockpool/peers.go

cmd/disasm/main.go

cmd/ethereum/blocktest.go

cmd/ethereum/main.go

cmd/ethtest/main.go

cmd/evm/main.go

cmd/mist/bindings.go

cmd/mist/gui.go

cmd/mist/html_container.go

cmd/mist/main.go

cmd/mist/qml_container.go

cmd/mist/ui_lib.go