MockContact moved to the Toolkit
Solve conflicts from pull request
Merge pull request #510 from owdqa/feature/mockcontact

Feature/mockcontact