Updating for 3.0
Update composer.json
Merge branch 'master' of https://github.com/claroline/ImagePlayerBundle into 3.0-update

Conflicts:
	Resources/views/image.html.twig
	composer.json
Merge branch '3.0-update' of https://github.com/claroline/ImagePlayerBundle into 3.0-update
Merge pull request #12 from claroline/3.0-update

Updating for 3.0