Merge branch 'master' into signer-rpc

Conflicts:
	dapps/src/lib.rs
	parity/main.rs
	parity/signer.rs
	signer/Cargo.toml
	signer/src/lib.rs

parity/main.rs

@@ -53,8 +53,6 @@ extern crate ethcore_dapps;
 #[cfg(feature = "ethcore-signer")]
 extern crate ethcore_signer;
 
-
-
 #[macro_use]
 mod die;
 mod price_info;