Force add tribler_main
Merge pull request #347 from Tribler/setup_fix

Force add tribler_main
Merge branch 'devel' of git://github.com/Tribler/tribler into devel