Update java doc, add  protocolHint.clear(); to clear method
Make it Java6 confirm, Fix warnings with Throwable
Update java docs
Rename EMPTY_PUBLICKEY to EMPTY_PUBLIC_KEY
Fix typo in ChannelServerConfiguration
Rename addPeerStatusListeners to addPeerStatusListener, fix javadocs
Fix resource leakage by first call buffer release and then iterator remove
Merge pull request #53 from bitsquare/master

Fix resource leakage
Fix resource leakage in capacity (similar to
f2152321f6e21ea7caac903ecde5717c16c3e77d)
Update java docs and fix typos, no functional changes
Merge pull request #54 from bitsquare/master

Update java docs and fix typos, no functional changes
fixed resource leak: ByteBuf.release() was not called before it's
garbage-collected
improved comment
Interface binding improvments.
update to latest netty
minor changes to work with tomp2p.net
merged pull request #52
Merge remote-tracking branch 'tomp2p/master'

Conflicts:
	core/src/main/java/net/tomp2p/connection/ChannelCreator.java
	core/src/main/java/net/tomp2p/connection/ChannelServerConficuration.java
	core/src/main/java/net/tomp2p/connection/Dispatcher.java
	core/src/main/java/net/tomp2p/connection/PeerCreator.java
	core/src/main/java/net/tomp2p/connection/RequestHandler.java
	core/src/main/java/net/tomp2p/connection/Sender.java
	core/src/main/java/net/tomp2p/p2p/Peer.java
	examples/src/main/java/net/tomp2p/examples/relay/ExampleRelaySituation.java
	examples/src/main/java/net/tomp2p/examples/relay/QueryNode.java
	nat/src/main/java/net/tomp2p/nat/PeerBuilderNAT.java
	nat/src/main/java/net/tomp2p/nat/PeerNAT.java
	nat/src/main/java/net/tomp2p/relay/DistributedRelay.java
	nat/src/main/java/net/tomp2p/relay/PeerMapUpdateTask.java
	nat/src/main/java/net/tomp2p/relay/RelayRPC.java
	nat/src/main/java/net/tomp2p/relay/RelayType.java
	nat/src/main/java/net/tomp2p/relay/android/AndroidForwarderRPC.java
	nat/src/main/java/net/tomp2p/relay/android/AndroidRelayConnection.java
	nat/src/main/java/net/tomp2p/relay/android/BufferedMessageHandler.java
	nat/src/main/java/net/tomp2p/relay/android/MessageBuffer.java
	nat/src/main/java/net/tomp2p/relay/android/MessageBufferConfiguration.java
	nat/src/main/java/net/tomp2p/relay/android/MessageBufferListener.java
	nat/src/main/java/net/tomp2p/relay/tcp/OpenTCPForwarderRPC.java
	nat/src/main/java/net/tomp2p/relay/tcp/OpenTCPRelayConnection.java
	nat/src/test/java/net/tomp2p/relay/TestRcon.java
	nat/src/test/java/net/tomp2p/relay/TestRelay.java
	nat/src/test/java/net/tomp2p/relay/UtilsNAT.java
	nat/src/test/java/net/tomp2p/relay/android/TestMessageBuffer.java