kontaktai
Merge branch 'develop' of https://github.com/skirsdeda/Arkestra into develop

Conflicts:
	contacts_and_people/templates/includes/people_search.html