admin changed
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	crm/views.py
Merge remote-tracking branch 'origin/master'
admin changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	crm/views.py