mailchimp refactoring
Merge branch 'master' of https://github.com/Zygar/social-development-partners-crm

Conflicts:
	app/js/controllers.js
	app/partials/mailchimp.html