[OE-2716] work on contacts refactoring
Merge branch 'feature/contacts' of github.com:openeyes/OpenEyes into feature/contacts