ADD, I SAY!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	base_api/views.py
	templates/add_edit_client.html