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
Filter resource data with workspace when in a workspace
Merge branch 'master' into enhancement_user__badge_management
add importer ics format + fix bug on date picker
check style
fixed bug on table sorter
Added key check (closes #388)
Merge pull request #401 from stefk/key-check

Added key check (closes #388)
add dependence ical parser + check style
Merge pull request #391 from maxailloud/enhancement_user__badge_management

Add resource form field on badge rule [Pending]
Merge pull request #398 from easy-es/agenda

Agenda
Keep specific resource permissions when applying permissions recursively
Merge pull request #402 from stefk/recursive-perms

Keep specific resource permissions when applying permissions recursively
Merge branch 'master' of github.com:claroline/CoreBundle into default-resource-perms

Conflicts:
	Manager/RightsManager.php