Replacing <video> tag by <object> tag in VideoPlayerBundle
Refactoring the resource voter
Making PHPMD happy
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Controller/ResourceController.php
	src/core/Claroline/CoreBundle/Library/Security/Voter/ResourceVoter.php
	src/core/Claroline/CoreBundle/Tests/Controller/ActivityControllerTest.php
	src/core/Claroline/CoreBundle/Tests/Controller/ResourceController/ResourceControllerTest.php