Fixing upgrade.
Merge branch 'master' of https://github.com/claroline/CoreBundle into bugfix

Conflicts:
	Controller/Administration/PackageController.php
	Manager/DependencyManager.php
	Resources/public/js/administration/packages.js
	Resources/translations/platform.en.yml
Fixing merge
Merge pull request #762 from ngodfraind/bugfix

Bugfix