Fixed ClientTest.java. Added functionality to reopen P2P windows.
Merge remote-tracking branch 'upstream/master'