Next for devel

Rebased Tribler/next branch