Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Correcting coding style
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/core/Claroline/CoreBundle/Resources/views/Administration/registrationManagementSelectedWorkspacesAndRoles.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
Merge pull request #199 from maxailloud/master

Correcting coding style