Merge branch 'master' into ethminer_crate

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

ethcore/src/client.rs

@@ -190,6 +190,7 @@ pub trait BlockChainClient : Sync + Send {
 
 	/// Attempts to seal given block. Returns `SealedBlock` on success and the same block in case of error.
 	fn try_seal(&self, block: ClosedBlock, seal: Vec<Bytes>) -> Result<SealedBlock, ClosedBlock>;
+
 }
 
 #[derive(Default, Clone, Debug, Eq, PartialEq)]