Fixed association mapping (closes #2)
Merge branch 'master' of https://github.com/claroline/Claroline
Merge branch 'master' of https://github.com/claroline/Claroline