Conflicts:
	Cargo.toml

* Strip colour for everywhere except the terminal.

* Log to file.

Fixes #1560.

* Fix indentation.

[ci:skip]

* Remove unnecessary clone()ing.

* Update setup_log.rs

* remove unnecessary mutex in logging (#1601)

Using streamlined parity-ui repository

Optimizing InstructionInfo access.

V7 Migration progress indicator

bring snapshotting work into master

* Bumping clippy

* Fixing warnings

Conflicts:
	evmbin/bench.sh

* expunge &Vec<T> pattern

* fix travis

* EVM bin benches

* Optimizing mem gas cost

* Removing overflow_div since it's not used

* More benchmarks

* cleanup parity/signer

* remove redundant import of signer crate from main.rs

* rpc and signer are no longer optional

* move importing extern crates to main.rs file

Nikolay Volf authored Jul 11, 2016 and Arkadiy Paronyan committed Jul 11, 2016

* chain notify trait

* replaced network service with io service

* fix ethcore crate warnings

* refactored network service without generic

* ethcore fix

* ethsync refactoring

* proper linking of notify

* manage network interface

* rpc crate rebinding

* full rewire

* sync internal io service

* fix deadlock

* fix warnings and removed async io

* sync imported message propagation

* fix rpc warnings

* binart warnings

* test fixes

* rpc mocks and tests

* fix util doctest

* fix message name and removed empty notifier

* pointers mess & dark mode fixed

* fixed sync doctest

* added few warnings

* fix review

* new convention match

* fix error unwraps

* doctest fix