Changing rule which defines duplicate participants in participant-import

Rule use to define a pre-recruit as a duplicate if the pre-recruit has the
same first and last name and a matching phone number to an existing participant.
Now  they are defined as a pre-recruit if the pre-recruit has a phone number
(home or cell) that matches an existing participant's phone number who belongs
to the same cohort.
Merge remote branch 'origin/develop' into qa
Event system now tracks when participants are released to services

All services are now associated with an event_type which is used every
time a participant is released to that service.  For services which are
not release based the event_type still exists, but it the event will
never show for any participant.
Fixing minor bug
Merge remote branch 'origin/qa' into release
Merge remote branch 'origin/release' into develop

Conflicts:
	doc/design/mastodon.mwb