Circuit ids can no longer collide with each other
Merge branch 'devel' of github.com:Devristo/tribler into devel

Conflicts:
	Tribler/community/anontunnel/DispersyTunnelProxy.py