peerid
Merge branch 'master' into mariusz2
Merge remote-tracking branch 'origin/mariusz2'

Conflicts:
	TinTorrent.pro.user
	torrenthandler.cpp