merge

chain/block_manager.go

chain/chain_manager.go

chain/dagger.go

chain/error.go

chain/filter.go

chain/state_transition.go

chain/types/block.go

chain/types/bloom9.go

cmd/ethereum/main.go

cmd/mist/assets/qml/views/miner.qml

cmd/mist/assets/qml/views/wallet.qml

cmd/mist/main.go

cmd/utils/cmd.go

peer.go

tests/helper/vm.go

tests/vm/gh_test.go

vm/execution.go

vm/stack.go

vm/types.go

vm/vm_debug.go