corrected joins tables
Merge branch 'master' into chantal