Merge pull request #391 from micheldumontier/release3

clinical trials refactor