TinyMCE update (exit confirm when content is not saved)
Merge remote-tracking branch 'upstream/master'
Adding captcha to the creation form.
sortable table ascending and descending
Merge branch 'master' of https://github.com/claroline/CoreBundle into ergonomy

Conflicts:
	Controller/AdministrationController.php
	Resources/views/Administration/Users/list.html.twig
	Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
Captcha added automatically on every sf2 form if the current user is anonymous.
Should fix the WorkspaceController::OpenAction method.
Merge branch 'master' of github.com:claroline/CoreBundle into captcha

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
Small fixes.
erge conflict
Added user picker to tinymce
Resolved conflicts after merge
Updated core bundle
Merge commit '52e50d5'
Remove useless code
Make API fluent for Tool entity + change getDisplayName method to get the displayname or the name
Changing old badge tool display name + creating new my badges tool
Adding html constraint on field name and description to limit them to 128 caracter
Display all available badges on my badges tool in workspace
Adding template to display badges on my badges tool in workspace