Taking into account that Dispersy Callback id's are all unicode.
Merge pull request #104 from boudewijn-tribler/callbackids

Taking into account that Dispersy Callback id's are all unicode.
Merge remote-tracking branch 'remotes/upstream/devel' into logging

Conflicts:
	Tribler/dispersy