Merge branch 'master' into signer-signing

Conflicts:
	rpc/src/v1/impls/eth.rs
	rpc/src/v1/tests/mocked/eth.rs
	rpc/src/v1/traits/eth.rs

signer/src/lib.rs

@@ -31,10 +31,11 @@
 //! ```
 //! extern crate ethcore_signer;
 //!
-//! use ethcore_signer::Server;
+//! use ethcore_signer::ServerBuilder;
 //!
 //!	fn main() {
-//!	 let _server = Server::start("127.0.0.1:8084".parse().unwrap());
+//!	 let builder = ServerBuilder::new();
+//!	 let _server = builder.start("127.0.0.1:8084".parse().unwrap()).unwrap();
 //!	}
 //! ```