Merge branch 'master' into ethminer_crate

Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml

miner/src/transaction_queue.rs

@@ -79,6 +79,7 @@
 //!		- When it's removed from `current` - all transactions from this sender (`current` & `future`) are recalculated.
 //!
 
+use std::default::Default;
 use std::cmp::{Ordering};
 use std::collections::{HashMap, BTreeSet};
 use util::numbers::{Uint, U256};
@@ -102,6 +103,7 @@ struct TransactionOrder {
 	hash: H256,
 }
 
+
 impl TransactionOrder {
 	fn for_transaction(tx: &VerifiedTransaction, base_nonce: U256) -> Self {
 		TransactionOrder {
@@ -255,6 +257,12 @@ pub struct TransactionQueue {
 	last_nonces: HashMap<Address, U256>,
 }
 
+impl Default for TransactionQueue {
+	fn default() -> Self {
+		TransactionQueue::new()
+	}
+}
+
 impl TransactionQueue {
 	/// Creates new instance of this Queue
 	pub fn new() -> Self {