Merge branch 'private_search' of
ssh://git@github.com/NielsZeilemaker/tribler.git into private_search

Conflicts:
	Tribler/community/privatesearch/community.py
Merge branch 'private_search' of
ssh://git@github.com/NielsZeilemaker/tribler.git into private_search