Fix contact group searching
Merge branch 'develop' into feature/issue-637-cant-search-across-groups

Conflicts:
	go/contacts/views.py
Merge branch 'feature/issue-637-cant-search-across-groups' into develop