fix bug resource-linker
Merge branch 'master' of https://github.com/claroline/CoreBundle

Conflicts:
	Resources/views/Resource/configResourcesManager.html.twig
Merge branch 'master' of https://github.com/claroline/CoreBundle
fixed on calendar and form(zend truc)
Merge branch 'master' of https://github.com/claroline/CoreBundle