Small import fix
Merge pull request #335 from Tribler/import_fix

Small import fix
Use CollectedTorrent.
Merge branch 'devel' into db-refactory