multi
multiserver
Merge branch 'master' of github.com:salamanderrex/jtorrent

Conflicts:
	client/jtorrent
	client/jtorrent.pro.user
	server/jtorrent_server.pro.user