merge

cmd/mist/gui.go

core/block_manager.go

core/state_transition.go

core/transaction_pool.go

core/types/transaction.go

core/vm_env.go

miner/miner.go

state/state.go

tests/files/StateTests/stInitCodeTest.json

tests/files/StateTests/stRefundTest.json

tests/files/StateTests/stSystemOperationsTest.json

tests/files/StateTests/stTransactionTest.json

tests/files/VMTests/vmArithmeticTest.json

tests/files/index.js

tests/helper/vm.go

tests/vm/gh_test.go

vm/common.go

vm/vm_debug.go

xeth/hexface.go

xeth/js_types.go