Merge pull request #3 from Edzelopez/AMGA-5

AMGA-5 Multiple commits
AMGA-5 --more work on importing contacts
AMGA-5 created membership types