Refactored clinical trial participant import to match current Bonnie model
Merge branch 'clinical_trial_support' into bonnie_master, fixes #190