Conflicts:
	ethcore/src/client/client.rs

state query for archive jdb

Fix for option 1 of JournalDB

Rename into something that is a little more descriptive.

JournalDB with in-memory overlay (option2)

additional (failing) SecretStore test

Updating clippy & fixing warnings.

rpc web3 tests

Making personal json-rpc configurable via cli

Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs

Rearrange journaldb infrastructure to make more extensible

JournalDB -> Box<JournalDB>, and it's a trait.

Conflicts:
	parity/main.rs

fix warning for transaction_queue.add usage

Adding std::mem back (only for asm)

update readme to exclude beta step (stable is ok)