Merging PrivateSearch and PrivateSocial into Tribler/devel