Distinction between activities and calls
Merge branch 'master' of https://github.com/Bangar-and-Venegas/pipeDashboard

Conflicts:
	app/views/dashboard/_panel.html.erb