mark didn't really make a mark
allows peers from multiple PeerDiscovery objects. Resolves issue 302
Merge remote-tracking branch 'origin'

Conflicts:
	core/src/main/java/com/google/bitcoin/core/PeerGroup.java
Merge branch 'master' of https://github.com/bitcoinj/bitcoinj
added getter/setter for "number of peers to discover", listener now gets a copy of the Address set
blabla