Merge branch '605-add-database-method-for-retrieving-a-contact-by-local-and-remote-author-ids' into 'master'

Add database method for retrieving a contact by local and remote author IDs

Closes #605

See merge request !302