Added nickname tracking counters
Nil check on date comparison
Add find duplicates by email
Merge branch 'master' of https://github.com/CruGlobal/mpdx into improve-find-duplicates
Switched to combined query for contact duplicates