partial commit
partial commit
Adding resource field on badge rule form
Using an other way to display resource on badge rule
Uses a form theme file for badge rules instead of copy/paste every modification in every files
Fixed translation
Filter resource data with workspace when in a workspace
Merge branch 'master' into enhancement_user__badge_management
Update composer.json

The vesion 1.2 of "willdurand/js-translation-bundle" doesn't existe.
wip
Merge branch 'master' of https://github.com/claroline/CoreBundle
Fix url in notification
Merge pull request #396 from solispauwels/alter

Fix url in notification
add importer ics format + fix bug on date picker
check style
Merge branch 'master' into admin-refact

Conflicts:
	Controller/Administration/ParametersController.php
Facebook active state
Merge pull request #393 from anasdox/master

Update composer.json
Merge pull request #400 from stefk/admin-refact

Fixed workspace management page + refactored parameter section
Merge remote-tracking branch 'upstream/master' into alter

Conflicts:
	Controller/Administration/ParametersController.php
	Resources/views/Administration/Parameters/facebookForm.html.twig