started work on nic discovery
Merge branch 'fBitTorrent' into fCleanup

Conflicts:
	pieShareApp/src/main/java/org/pieShare/pieShareApp/service/shareService/BitTorrentService.java