Missing import.
Merge pull request #270 from boudewijn-tribler/bugfixes

Missing import.
Advance Dispersy pointer.
Merge pull request #272 from boudewijn-tribler/bugfixes

Advance Dispersy pointer.
Merge remote-tracking branch 'upstream/devel' into videoplaylist

Conflicts:
	Tribler/dispersy