AMGA-13 Bug fixes for duplicate stuff related to contacts
Merge pull request #32 from Edzelopez/AMGA-5

AMGA-13 Bug fixes for duplicate stuff related to contacts