Search people
Merge branch 'master' of github.com:vkblind/vkblind into feature/search-people

Conflicts:
	search/templates/search.html
	search/views.py
	vkblind/settings.py
changed related name for UserSettings model to avoid naming clashes
Merge branch 'master' of github.com:vkblind/vkblind
Merge branch 'master' of github.com:vkblind/vkblind
fix typer