Remove duplicate declarion of contactMethod service for a contactable
DisplayName for contactable on client-side
Fix activity template binding in dashboard
Remove file generated by a merge
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/templates/contactables.html