Fixed import
Merge pull request #348 from Tribler/setup_fix

Fixed import
Merge branch 'devel' of git://github.com/Tribler/tribler into devel

Conflicts:
	Tribler/Main/tribler.py