Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests
Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests