Resource manager update
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/plugin/Claroline/ExampleBundle
	src/plugin/Claroline/ForumBundle