Solve a problem that appears in the moment of the last merge
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Resources/views/Layout/top_bar.html.twig