cat1 encounter importer/export transfer from/to support
Merge branch 'cat1-encounter-transfers'

Rebasing and merging pull request #88