Update
Merge branch 'master' of https://github.com/claroline/ExampleBundle

Conflicts:
	Resources/views/examplebundletheme/Layout/topBar.html.twig