zelisha edits
Merge branch 'test' of https://github.com/mothalit/PeerToPeer into test

Conflicts:
	Common.cfg
	PeerInfo.cfg
	log_peer1003.log
	tester.dat