Activities view
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/templates/activities.html