Massive cleanup
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	Tribler/community/anontunnel/community.py
	Tribler/community/anontunnel/conversion.py
cleanup after merge