Fixed nickname bug.
Last minute documentation as well as P2PClient fix.
Merge remote-tracking branch 'upstream/master'