Add a conference drupal client
Merge branch 'master' into test