merge errors fixed

block_pool.go

chain/block_manager.go

chain/chain_manager.go

chain/error.go

chain/transaction_pool.go

chain/types/transaction.go

cmd/mist/bindings.go

cmd/mist/ui_lib.go

ethutil/big.go

miner/miner.go

peer.go

state/state.go

state/state_object.go

tests/files/BasicTests/genesishashestest.json

tests/files/StateTests/stExample.json

tests/files/StateTests/stPreCompiledContracts.json

tests/files/StateTests/stRecursiveCreate.json

tests/files/StateTests/stSpecialTest.json

tests/files/StateTests/stSystemOperationsTest.json

tests/files/TrieTests/trietest.json