peerwire
Merge branch 'master' into mariusz

Conflicts:
	TinTorrent.pro.user

peer