Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs

extend sync status interface to sync provider

--archive is default. --pruning is option.

Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs

jsonrpc uses client and sync interfaces

Expose transaction insertion in sync lib

Removing get prefix from poll_info

Conflicts:
	sync/src/lib.rs

Tx queue update height bug

Tx_queue_docs -> To master

blockchain import_route

Stop workers before stopping event loop

Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs

Conflicts:
	sync/src/transaction_queue.rs

Validate sender before importing to queue

Gas price threshold for transactions

`dev` feature enabled when compiling without `--release`

Conflicts:
	parity/main.rs

Don't call mark_as_bad needlessly