Resolve conflict and Merge branch 'MultipleContactSameEmail' of https://github.com/JMAConsulting/uk.co.vedaconsulting.mailchimp into JMAConsulting-MultipleContactSameEmail
Resolve conflict and Merge branch 'MultipleContactSameEmail' of https://github.com/JMAConsulting/uk.co.vedaconsulting.mailchimp into JMAConsulting-MultipleContactSameEmail

Conflicts:
	CRM/Mailchimp/Sync.php

veda-consulting/uk.co.vedaconsulting.mailchimp,artfulrobot/uk.co.vedaconsulting.mailchimp,artfulrobot/uk.co.vedaconsulting.mailchimp,krishgopi/uk.co.vedaconsulting.mailchimp,veda-consulting/uk.co.vedaconsulting.mailchimp,krishgopi/uk.co.vedaconsulting.mailchimp