checkstyle
Merge branch 'master' of https://github.com/claroline/Claroline
Fixing last errors + some checkstyle